From: Gert Wollny Date: Fri, 1 Nov 2019 16:10:32 +0000 (+0100) Subject: New upstream version 3.6.5 X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~26^2~7 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=4c639b3bf47960829ef5094831e1205390f9da64;p=dcmtk.git New upstream version 3.6.5 --- diff --git a/ANNOUNCE b/ANNOUNCE index 513b9d12..f4d40abd 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,12 +1,13 @@ ANNOUNCEMENT -Version 3.6.4 of the OFFIS DCMTK (DICOM ToolKit) software is now available for +Version 3.6.5 of the OFFIS DCMTK (DICOM ToolKit) software is now available for public release. This is a minor release that includes the following changes -over the previous version 3.6.3: +over the previous version 3.6.4: -- DCMTK 3.6.4 builds correctly on older and up-to-date versions of GNU gcc - (4.2.1 to 8.2.1) Clang (3.4.2 to 7.0.0), Microsoft Visual Studio (2005 to - 2017) and SunPro CC (5.14 and 5.15). +- DCMTK 3.6.5 builds correctly on older and up-to-date versions of GNU gcc + (4.4.7 to 9.2.0), Clang (3.4.2 to 9.0.0), AppleClang (11.0.0), Microsoft + Visual Studio (2008 to 2019), SunPro CC (5.14 and 5.15) and IBM XL C/C++ + (16.1.1.3). - Tested with the following operating systems/environments: @@ -26,120 +27,124 @@ over the previous version 3.6.3: - GNU Autoconf is still deprecated, running 'configure' emits a warning by default. Support for GNU Autoconf will be removed after this release. -- Updated data dictionary, SOP Class and Transfer Syntax UIDs for the recently - approved changes to the DICOM standard (i.e. Supplements and CPs), up to DICOM - standard release DICOM 2018d plus Supplement 188 (Multi-energy CT Images), - CP-1803 and CP-1809. +- Updated data dictionary, SOP Class, Frame of Reference and Transfer Syntax + UIDs for the recently approved changes to the DICOM standard (i.e. Supplements + and CPs), up to DICOM standard release DICOM 2019c plus Supplement 175 (Second + Generation Radiotherapy - C-Arm RT Treatment Modalities). -- Added "dcmicmp", a new tool that reads two DICOM images, an original - "reference image" and a post-processed "test image" to which some kind of - processing such as a lossy image compression has been applied. dcmicmp - compares both images and computes several metrics that describe how similar - or different both images are. +- Added support for directory record "RADIOTHERAPY" that has been introduced + with Supplement 147 (Second Generation Radiotherapy - Prescription and Segment + Annotation). -- Added new command line applications: cda2dcm and stl2dcm for encapsulation - of HL7 CDA documents and STL files into DICOM file format. Revised - implementation of pdf2dcm based on new class DcmEncapsulatedDocument. +- Added support for the three new 64-bit integer VRs introduced with CP-1819: + Other 64-bit Very Long (OV), Signed 64-bit Very Long (SV) and Unsigned 64-bit + Very Long (UV). -- The lossless JPEG decoder can now handle images compressed with the - Cornell codec, which creates invalid Huffman codes for 16-bit images. +- Implemented support for the Extended BCP 195 TLS Profile, introduced with + Supplement 206, in the dcmtls module and the various TLS-enabled DCMTK tools. -- The new class OFRandom implements a cryptographically secure pseudo - random number generator (PRNG) based on the ISAAC algorithm and its public - domain reference implementation by Bob Jenkins. +- Added option to "storescu" to rename files after processing them by appending + ".bad" or ".good" at the end of the filename. -- Major revision of the TLS code in DCMTK (module dcmtls and related command - line tools) implementing DICOM Supplement 204 "TLS Security Profiles". - Selection of TLS ciphersuites is now based on security profiles, and - DCMTK now implements the recommendations of BCP 195 / RFC 7525. - -- DCMTK can now be compiled with LibreSSL as an alternative to OpenSSL. +- Added new options to "wlmscpfs" that allow for dumping incoming C-FIND + requests to text files using a configurable directory and filename. - Updated automatically generated Context Group classes in "dcmsr" - (Structured Reporting) based on DICOM 2018d. Also updated the Code + (Structured Reporting) based on DICOM 2019c. Also updated the Code definitions from the supported coding schemes such as DICOM, NCIt and UMLS. - Further enhanced DICOM Structured Reporting (SR) module "dcmsr": - - Added support for included template TID 4019 (Algorithm Identification) to - the implementation of TID 1419 (ROI Measurements). + - Added support for the Performed Imaging Agent Administration SR IOD and the + Planned Imaging Agent Administration SR IOD introduced with Supplement 164. + + - Added support for the Synchronization Module, which is required for some SR + IODs, e.g. Procedure Log SR or Performed Imaging Agent Administration SR. + + - Added initial support for coding scheme "SCT" (SNOMED CT) by defining those + CODE_SCT_xxx code constants that are needed for the "cmr" submodule. + + - Updated SR Template classes from DCMR for the 2019b edition of the DICOM + standard, i.e. all SRT (SNOMED RT) codes were replaced by their associated + SCT (SNOMED CT) counterparts. This change was introduced with CP-1850. + + - Added new print flag PF_printEmptyCodes, which prints the text "empty code" + for empty codes instead of "invalid code". This new flag is e.g. used for + the output stream operator of the DSRCodedEntryValue class. - - Added a document tree node filter that checks for the presence or absence - of a concept name, i.e. whether it is empty or not. +- The list of elliptic curves to be negotiated as part of a TLS is now created + dynamically, i.e. it is tested at runtime which elliptic curves are supported + by the installed OpenSSL library. - - Added new and enhanced existing code examples for this module. +- Allow disabling Functional Group checks when writing Segmentations and + Parametric Map objects in order to speed up writing objects with many frames. -- Enhanced Worklist SCP code to make use of existing classes and functions - instead of using its own "spaghetti" code for everything. This also - resolves issues with the Worklist SCP rejecting some legit Worklist queries - as its own verification functions were too strict. +- Added macro that enables the wide char (wchar_t*) support of the XML parser + that is part of the DCMTK (ofstd/ofxml). This support is limited to Windows + systems and still regarded as experimental (see documentation for details). -- Added method getNumberOfValues() to all VR and other classes that are - derived from DcmObject (such as DcmItem). This new method always returns - the number of values currently stored in the corresponding object/element, - in contrast to getVM(), which sometimes returns the constant 1, or card(), - which is not available for all classes. +- The tool "findscu" now always returns with a non-zero exit code when an error + occurred, e.g. when association negotiation failed. -- The ACSE timeout, e.g. passed to the various networking command line tools - using --acse-timeout, is now also used for the first PDU to be read. This is - another step towards cleaning up the timeout handling in dcmnet module. +- CMake-related enhancements: -- Replaced all calls of strcpy() by OFStandard::strlcpy(), which should reduce - the possibility of buffer overflows. Also added OFStandard::snprintf() and - OFStandard::vsnprintf(), which should be used within the DCMTK as safe and - portable helper functions. + - DCMTK now understands and makes use of the CMake variable CMAKE_CXX_STANDARD + when a CMake version that supports it is employed (CMake 3.1.3 and newer). -- Fixed bug in dcmseg that produced broken binary Segmentation objects if the - number of pixels were not dividable by 8 for a single frame. + - Added CMake option that controls whether DCMTK gets compiled using the + multi-threaded static or DLL runtime library when using MSVC on Windows. -- Enhanced Worklist SCP code to make use of existing classes and functions - instead of using its own "spaghetti" code for everything. This also - resolves issues with the Worklist SCP rejecting some legit Worklist queries - as its own verification functions were too strict. +- Various fixes and extensions to the JPEG-LS implementation: -- Introduced a subset of std::filesystem to ofstd, currently providing the - classes OFpath, OFdirectory_entry and OFdirectory_iterator as portable - implementations for the respective C++17 STL classes. + - Added command line options controlling how odd-length bitstreams are + padded to even length (for compatibility with HP LOCO). -- The Windows implementation of class OFReadWriteLock class now uses Slim - Reader/Writer (SRW) Locks, which are available since Windows Vista, instead - of the older implementation based on a Mutex, a Semaphore and a counter, - because SRW locks are much faster. + - Added command line option that causes the decoder to store images even + though an error occurred during the decoding process, which may be helpful + for slightly truncated bitstreams. -- Changed version numbering of shared objects. On Posix operating systems, - it now follows these guidelines: https://autotools.io/libtool/version.html. + - Enable setting of individual JPEG-LS encoding parameters + T1, T2, T3 and RESET. -- Fixed various issues that occurred after the official 3.6.3 release. + - Various bugfixes in JPEG-LS encoder and decoder. + +- Fixed binary Segmentation object creation when width is not dividable by 8. + +- Fixed wrong DIMSE status codes A8xx (for C-STORE and C-FIND) and A800 (for + C-GET and C-MOVE), which were never defined in the official DICOM standard. + Now, the DCMTK uses the correct DIMSE status code 0122H for "SOP Class not + supported" for all DIMSE messages. + +- Fixed various issues that occurred after the official 3.6.4 release. See CHANGES file for details. Many people have contributed to this new release of DCMTK, appearing here in alphabetical order. Thank you very much for your support! - Klaus Eisentraut - Andrey Fedorov - Florian Franzen - Christian Fremgen - Omar Ganiev + Victor Derks + Chinna Durai + Holger Franke + Sergei Gordey Daniel Grieger - Helmut Grohne - GwanYeong Kim + Bengt Gustafsson + Alexander Haderer Peter Klotz + Brian Lucas Mathieu Malaterre - Savvas Metallidis - Isaiah Norton - Lukas Raesenhoeft - Uli Schlachter - Max Smolens (github user msmolens) - Christian Wetzel - Gert Wollny - Sahab Zanjanizadeh - - Thomas Dement + Hans Meine + Maria Samoylova + Martin Wenger + Brian Wise + Grischa Zengel + + Andreas Gravgaard Andersen (GitHub user "agravgaard") Hans Johnson (GitHub user "hjmjohnson") + Stefano Magni - Forum user "deepakt" - GitHub user "sercxjo" + Forum user "AlexanderLysenko" + GitHub user "eborisch" + GitHub user "FreddyFunk" Members of the DCMTK Team who have worked on this release are (in alphabetical order): @@ -161,4 +166,4 @@ The DCMTK software can be downloaded via: https://dicom.offis.de/dcmtk or https://www.dcmtk.org/ -OFFIS e.V., Oldenburg, Germany, 2018-11-29 +OFFIS e.V., Oldenburg, Germany, 2019-10-28 diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake index de829f66..4a388aaf 100644 --- a/CMake/3rdparty.cmake +++ b/CMake/3rdparty.cmake @@ -33,6 +33,10 @@ if(WIN32 AND NOT MINGW) file(GLOB LIBICONV_DIR "${DCMTK_SOURCE_DIR}/../libiconv*") find_path(WITH_LIBICONVINC "include/iconv.h" "${LIBICONV_DIR}" NO_DEFAULT_PATH) + # OpenJPEG support: find out whether user has library + file(GLOB OPENJPEG_DIR "${DCMTK_SOURCE_DIR}/../openjpeg*") + find_path(WITH_OPENJPEGINC "lib/openjp2_o.lib" "${OPENJPEG_DIR}" NO_DEFAULT_PATH) + # libxml support: configure compiler if(DCMTK_WITH_XML) if(WITH_LIBXMLINC) @@ -153,7 +157,31 @@ if(WIN32 AND NOT MINGW) endif() endif() -else() + # OpenJPEG support: configure compiler + if(DCMTK_WITH_OPENJPEG) + if(WITH_OPENJPEGINC) + # Unfortunately, OpenJPEG uses a version number in the include path. This needs special handling. + file(GLOB OPENJPEG2_DIR "${WITH_OPENJPEGINC}/include/openjpeg*") + find_path(WITH_OPENJPEGINC1 "openjpeg.h" "${OPENJPEG2_DIR}" NO_DEFAULT_PATH) + if ("${WITH_OPENJPEGINC1}" STREQUAL "WITH_OPENJPEGINC1-NOTFOUND") + message(STATUS "Info: DCMTK OpenJPEG support will be disabled because the header files were not found.") + set(DCMTK_WITH_OPENJPEG OFF CACHE BOOL "" FORCE) + set(WITH_OPENJPEG "") + else() + set(OPENJPEG_INCDIR "${WITH_OPENJPEGINC1}") + set(OPENJPEG_LIBDIR "${WITH_OPENJPEGINC}/lib") + set(OPENJPEG_LIBS debug "${OPENJPEG_LIBDIR}/openjp2_d.lib" optimized "${OPENJPEG_LIBDIR}/openjp2_o.lib") + message(STATUS "Info: DCMTK OpenJPEG support will be enabled") + set(WITH_OPENJPEG 1) + endif() + else() # turn off library if library path not set + message(STATUS "Warning: OpenJPEG support will be disabled because openjpeg directory was not specified. Correct path and re-enable DCMTK_WITH_OPENJPEG.") + set(DCMTK_WITH_OPENJPEG OFF CACHE BOOL "" FORCE) + set(WITH_OPENJPEG "") + endif() + endif() + +else(WIN32 AND NOT MINGW) # Find TIFF if(DCMTK_WITH_TIFF) @@ -164,11 +192,16 @@ else() set(DCMTK_WITH_TIFF OFF CACHE BOOL "" FORCE) set(WITH_LIBTIFF "") else() - message(STATUS "Info: DCMTK TIFF support will be enabled") set(WITH_LIBTIFF 1) # libtiff can be compiled with libjpeg support; if available, add libjpeg to library and include path find_package(JPEG QUIET) - include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) + if(NOT JPEG_FOUND) + message(STATUS "Info: DCMTK TIFF support will be enabled (but without JPEG)") + include_directories(${TIFF_INCLUDE_DIR}) + else() + message(STATUS "Info: DCMTK TIFF support will be enabled") + include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) + endif() set(LIBTIFF_LIBS ${TIFF_LIBRARY} ${JPEG_LIBRARY}) endif() endif() @@ -198,7 +231,10 @@ else() else() include(CheckLibraryExists) include(CheckCXXSourceCompiles) + set(TEMP_INCLUDES "${CMAKE_REQUIRED_INCLUDES}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}") CHECK_CXX_SOURCE_COMPILES("extern \"C\" {\n#include \n}\nint main(){\n#if OPENSSL_VERSION_NUMBER < 0x10001000L\n#error OpenSSL too old\n#endif\n}\n" OPENSSL_VERSION_CHECK) + set(CMAKE_REQUIRED_INCLUDES "${TEMP_INCLUDES}") if(OPENSSL_VERSION_CHECK) message(STATUS "Info: DCMTK OPENSSL support will be enabled") set(WITH_OPENSSL 1) @@ -306,7 +342,22 @@ else() endif() endif() -endif() + # Find OpenJPEG + if(DCMTK_WITH_OPENJPEG) + find_package(OpenJPEG QUIET) + if(NOT OPENJPEG_FOUND) + message(STATUS "Warning: OpenJPEG support will be disabled because the OpenJPEG library was not found.") + set(WITH_OPENJPEG "") + set(DCMTK_WITH_OPENJPEG OFF CACHE BOOL "" FORCE) + else() + message(STATUS "Info: DCMTK OpenJPEG support will be enabled") + set(WITH_OPENJPEG 1) + include_directories(${OPENJPEG_INCLUDE_DIRS}) + set(OPENJPEG_LIBS ${OPENJPEG_LIBRARIES}) + endif() + endif() + +endif(WIN32 AND NOT MINGW) if(NOT DEFINED DCMTK_WITH_STDLIBC_ICONV) include(CheckCXXSourceCompiles) diff --git a/CMake/DCMTKConfig.cmake.in b/CMake/DCMTKConfig.cmake.in index 66507330..c344bf28 100644 --- a/CMake/DCMTKConfig.cmake.in +++ b/CMake/DCMTKConfig.cmake.in @@ -24,6 +24,7 @@ set(DCMTK_WITH_ICONV @DCMTK_WITH_ICONV@) set(DCMTK_WITH_STDLIBC_ICONV @DCMTK_WITH_STDLIBC_ICONV@) set(DCMTK_WITH_ICU @DCMTK_WITH_ICU@) set(DCMTK_WITH_WRAP @DCMTK_WITH_WRAP@) +set(DCMTK_WITH_OPENJPEG @DCMTK_WITH_OPENJPEG@) set(DCMTK_WITH_DOXYGEN @DCMTK_WITH_DOXYGEN@) # Dictionary-related diff --git a/CMake/DCMTKConfig.old_cmake.in b/CMake/DCMTKConfig.old_cmake.in index e68f027e..765c4ca7 100644 --- a/CMake/DCMTKConfig.old_cmake.in +++ b/CMake/DCMTKConfig.old_cmake.in @@ -27,6 +27,7 @@ SET(DCMTK_WITH_ICONV @DCMTK_WITH_ICONV@) SET(DCMTK_WITH_STDLIBC_ICONV @DCMTK_WITH_STDLIBC_ICONV@) SET(DCMTK_WITH_ICU @DCMTK_WITH_ICU@) SET(DCMTK_WITH_WRAP @DCMTK_WITH_WRAP@) +set(DCMTK_WITH_OPENJPEG @DCMTK_WITH_OPENJPEG@) SET(DCMTK_WITH_DOXYGEN @DCMTK_WITH_DOXYGEN@) # Dictionary-related diff --git a/CMake/FindOpenJPEG.cmake b/CMake/FindOpenJPEG.cmake new file mode 100644 index 00000000..8589edcd --- /dev/null +++ b/CMake/FindOpenJPEG.cmake @@ -0,0 +1,36 @@ +# Find OpenJPEG library +# +# Released under BSD license +# +# OPENJPEG_INCLUDE_DIRS - where to find openjpeg.h, etc. +# OPENJPEG_LIBRARIES - Lists of libraries when using OpenJPEG +# OPENJPEG_FOUND - True if OpenJPEG found + +# Use pkg_check_modules to determine the paths for OpenJPEG +find_package(PkgConfig QUIET) +if(PKG_CONFIG_FOUND) + pkg_check_modules(OPENJPEG_PKGCONF libopenjp2) +endif() + +# Look for the header file +find_path(OPENJPEG_INCLUDE_DIR NAMES openjpeg.h HINTS ${OPENJPEG_PKGCONF_INCLUDE_DIRS}) +mark_as_advanced(OPENJPEG_INCLUDE_DIR) + +# Look for the library +set(OPENJPEG_LIBS openjp2) +find_library(OPENJPEG_LIBRARY NAMES ${OPENJPEG_LIBS} HINTS ${OPENJPEG_PKGCONF_LIBRARY_DIRS}) +mark_as_advanced(OPENJPEG_LIBRARY) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENJPEG REQUIRED_VARS OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR) + +# Copy the result to output variables +if(OPENJPEG_FOUND) + set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) + set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR}) +else() + set(OPENJPEG_LIBS) + set(OPENJPEG_LIBRARY) + set(OPENJPEG_LIBRARIES) + set(OPENJPEG_INCLUDE_DIR) + set(OPENJPEG_INCLUDE_DIRS) +endif() diff --git a/CMake/GenerateDCMTKConfigure.cmake b/CMake/GenerateDCMTKConfigure.cmake index 71f3d48d..b067355e 100644 --- a/CMake/GenerateDCMTKConfigure.cmake +++ b/CMake/GenerateDCMTKConfigure.cmake @@ -326,6 +326,7 @@ endif() CHECK_INCLUDE_FILE_CXX("cstdarg" HAVE_CSTDARG) CHECK_INCLUDE_FILE_CXX("signal.h" HAVE_SIGNAL_H) CHECK_INCLUDE_FILE_CXX("fenv.h" HAVE_FENV_H) + CHECK_INCLUDE_FILE_CXX("iterator" HAVE_ITERATOR_HEADER) if(NOT APPLE) # poll on macOS is unreliable, it first did not exist, then was broken until @@ -541,6 +542,7 @@ endif() CHECK_FUNCTION_EXISTS(connect HAVE_CONNECT) CHECK_FUNCTION_EXISTS(accept HAVE_ACCEPT) CHECK_FUNCTION_EXISTS(access HAVE_ACCESS) + CHECK_FUNCTION_EXISTS(atoll HAVE_ATOLL) CHECK_FUNCTION_EXISTS(bcmp HAVE_BCMP) CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) CHECK_FUNCTION_EXISTS(bind HAVE_BIND) @@ -565,8 +567,10 @@ endif() CHECK_FUNCTION_EXISTS(getlogin_r HAVE_GETLOGIN_R) CHECK_FUNCTION_EXISTS(getpid HAVE_GETPID) CHECK_FUNCTION_EXISTS(getpwnam HAVE_GETPWNAM) + CHECK_FUNCTION_EXISTS(getrusage HAVE_GETRUSAGE) CHECK_FUNCTION_EXISTS(getsockname HAVE_GETSOCKNAME) CHECK_FUNCTION_EXISTS(getsockopt HAVE_GETSOCKOPT) + CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_FUNCTION_EXISTS(getuid HAVE_GETUID) CHECK_FUNCTION_EXISTS(gmtime_r HAVE_GMTIME_R) CHECK_FUNCTION_EXISTS(index HAVE_INDEX) @@ -684,6 +688,9 @@ endif() CHECK_FUNCTIONWITHHEADER_EXISTS("int64_t definition" "${HEADERS}" HAVE_INT64_T) CHECK_FUNCTIONWITHHEADER_EXISTS("uint64_t definition" "${HEADERS}" HAVE_UINT64_T) + # ICU prefers to use char16_t, but it is only supported since C++11 + CHECK_FUNCTIONWITHHEADER_EXISTS("char16_t definition" "${HEADERS}" HAVE_CHAR16_T) + # File access stuff CHECK_FUNCTIONWITHHEADER_EXISTS("fpos64_t definition" "${HEADERS}" HAVE_FPOS64_T) CHECK_FUNCTIONWITHHEADER_EXISTS("off64_t definition" "${HEADERS}" HAVE_OFF64_T) @@ -1262,6 +1269,26 @@ int main() return 0; }") +function(DCMTK_CHECK_ITERATOR_CATEGORY CATEGORY) + if(HAVE_ITERATOR_HEADER) + string(TOUPPER "${CATEGORY}" CAT) + DCMTK_TRY_COMPILE(HAVE_${CAT}_ITERATOR_CATEGORY "the iterator category ${CATEGORY} is declared" + "#include +int main() +{ + typedef std::${CATEGORY}_iterator_tag category; + return 0; +}") + endif() +endfunction() + +DCMTK_CHECK_ITERATOR_CATEGORY(input) +DCMTK_CHECK_ITERATOR_CATEGORY(output) +DCMTK_CHECK_ITERATOR_CATEGORY(forward) +DCMTK_CHECK_ITERATOR_CATEGORY(bidirectional) +DCMTK_CHECK_ITERATOR_CATEGORY(random_access) +DCMTK_CHECK_ITERATOR_CATEGORY(contiguous) + function(ANALYZE_ICONV_FLAGS) if(DCMTK_WITH_ICONV OR DCMTK_WITH_STDLIBC_ICONV) set(TEXT "Detecting fixed iconv conversion flags") @@ -1384,44 +1411,66 @@ function(INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES) endif() # file needs update endfunction() -function(DCMTK_ADD_CXX11_FLAGS) - string(FIND "${CMAKE_CXX_FLAGS}" "${DCMTK_CXX11_FLAGS}" INDEX) - if(INDEX EQUAL -1) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DCMTK_CXX11_FLAGS}" PARENT_SCOPE) +function(DCMTK_CHECK_CXX_STANDARD STANDARD) + set(RESULT 0) + if(DEFINED HAVE_CXX${STANDARD}_TEST_RESULT) + if(HAVE_CXX${STANDARD}_TEST_RESULT) + set(RESULT 1) + endif() + else() + set(MESSAGE "Checking whether the compiler supports C++${STANDARD}") + message(STATUS "${MESSAGE}") + try_compile(COMPILE_RESULT "${CMAKE_BINARY_DIR}" "${DCMTK_SOURCE_DIR}/config/tests/cxx${STANDARD}.cc") + set(HAVE_CXX${STANDARD}_TEST_RESULT "${COMPILE_RESULT}" CACHE INTERNAL "Caches the configuration test result for C++${STANDARD} support.") + if(COMPILE_RESULT) + set(RESULT 1) + message(STATUS "${MESSAGE} -- yes") + else() + message(STATUS "${MESSAGE} -- no") + endif() endif() + set("ENABLE_CXX${STANDARD}" "${RESULT}" PARENT_SCOPE) endfunction() function(DCMTK_TEST_ENABLE_CXX11) - set(RESULT 0) - set(TEXT_RESULT "disabled") - if(DCMTK_ENABLE_CXX11) - if(DEFINED HAVE_CXX11_TEST_RESULT) - if(HAVE_CXX11_TEST_RESULT) - DCMTK_ADD_CXX11_FLAGS() - set(RESULT 1) - set(TEXT_RESULT "enabled") - endif() - else() - DCMTK_ADD_CXX11_FLAGS() # will automatically be removed by the function scope - set(MESSAGE "Checking whether the compiler supports C++11") - message(STATUS "${MESSAGE}") - try_compile(COMPILE_RESULT "${CMAKE_BINARY_DIR}" "${DCMTK_SOURCE_DIR}/config/tests/cxx11.cc") - set(HAVE_CXX11_TEST_RESULT "${COMPILE_RESULT}" CACHE INTERNAL "Caches the configuration test result for C++11 support.") - if(COMPILE_RESULT) - set(RESULT 1) - set(TEXT_RESULT "enabled") - message(STATUS "${MESSAGE} -- yes") - else() - message(STATUS "${MESSAGE} -- no") - endif() + get_property(MODERN_CXX_STANDARDS GLOBAL PROPERTY DCMTK_MODERN_CXX_STANDARDS) + foreach(STANDARD ${MODERN_CXX_STANDARDS}) + set(ENABLE_CXX${STANDARD} 0) + endforeach() + get_property(DCMTK_CMAKE_HAS_CXX_STANDARD GLOBAL PROPERTY DCMTK_CMAKE_HAS_CXX_STANDARD) + if(DCMTK_CMAKE_HAS_CXX_STANDARD) + get_property(MODERN_CXX_STANDARD GLOBAL PROPERTY DCMTK_MODERN_CXX_STANDARD) + if(MODERN_CXX_STANDARD AND DCMTK_ENABLE_CXX11) + dcmtk_upper_bound(MODERN_CXX_STANDARDS "${CMAKE_CXX_STANDARD}" N) + math(EXPR N "${N}-1") + foreach(I RANGE ${N}) + list(GET MODERN_CXX_STANDARDS ${I} STANDARD) + dcmtk_check_cxx_standard("${STANDARD}") + if(NOT ENABLE_CXX${STANDARD}) + break() + endif() + endforeach() + endif() + elseif(DCMTK_ENABLE_CXX11 AND NOT DCMTK_ENABLE_CXX11 STREQUAL "INFERRED") + # set C++11 compiler flags for the test, will automatically be removed by the function scope + string(FIND "${CMAKE_CXX_FLAGS}" "${DCMTK_CXX11_FLAGS}" INDEX) + if(INDEX EQUAL -1) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DCMTK_CXX11_FLAGS}" PARENT_SCOPE) + endif() + dcmtk_check_cxx_standard(11) + if(ENABLE_CXX11) + # push C++11 CXX-flags to the parent scope + set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE) endif() endif() - set(HAVE_CXX11 "${RESULT}" CACHE INTERNAL "Set to 1 if the compiler supports C++11 and it should be enabled.") - message(STATUS "Info: C++11 features ${TEXT_RESULT}") - if(RESULT) - # push C++11 CXX-flags to the parent scope - set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE) - endif() + foreach(STANDARD ${MODERN_CXX_STANDARDS}) + set(HAVE_CXX${STANDARD} "${ENABLE_CXX${STANDARD}}" CACHE INTERNAL "Set to 1 if the compiler supports C++${STANDARD} and it should be enabled.") + if(HAVE_CXX${STANDARD}) + message(STATUS "Info: C++${STANDARD} features enabled") + else() + message(STATUS "Info: C++${STANDARD} features disabled") + endif() + endforeach() endfunction() function(DCMTK_TEST_ENABLE_STL_FEATURE NAME) diff --git a/CMake/dcmtkMacros.cmake b/CMake/dcmtkMacros.cmake index db0cd51b..cdf17d78 100644 --- a/CMake/dcmtkMacros.cmake +++ b/CMake/dcmtkMacros.cmake @@ -172,3 +172,17 @@ else() unset(${VAR} PARENT_SCOPE) endmacro() endif() + +# A C++ STL style upper_bound function for CMake ';' lists +function(DCMTK_UPPER_BOUND LIST COMP VAR) + list(LENGTH "${LIST}" N) + math(EXPR LAST "${N}-1") + foreach(INDEX RANGE ${LAST}) + list(GET "${LIST}" ${INDEX} E) + if(COMP LESS E) + set("${VAR}" ${INDEX} PARENT_SCOPE) + return() + endif() + endforeach() + set("${VAR}" ${N} PARENT_SCOPE) +endfunction() diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake index e9f77b54..514803a4 100644 --- a/CMake/dcmtkPrepare.cmake +++ b/CMake/dcmtkPrepare.cmake @@ -7,9 +7,9 @@ if(DEFINED DCMTK_CONFIGURATION_DONE) endif() set(DCMTK_CONFIGURATION_DONE true) -# Minimum CMake version required -if(CMAKE_BACKWARDS_COMPATIBILITY GREATER 3.12.3) - set(CMAKE_BACKWARDS_COMPATIBILITY 3.12.3 CACHE STRING "Latest version of CMake when this project was released." FORCE) +# Latest CMake version tested +if(CMAKE_BACKWARDS_COMPATIBILITY GREATER 3.15.3) + set(CMAKE_BACKWARDS_COMPATIBILITY 3.15.3 CACHE STRING "Latest version of CMake when this project was released." FORCE) endif() # CMAKE_BUILD_TYPE is set to value "Release" if none is specified by the @@ -38,14 +38,14 @@ endif() # a development snapshot and an even number indicates an official release.) set(DCMTK_MAJOR_VERSION 3) set(DCMTK_MINOR_VERSION 6) -set(DCMTK_BUILD_VERSION 4) +set(DCMTK_BUILD_VERSION 5) # The ABI is not guaranteed to be stable between different snapshots/releases, # so this particular version number is increased for each snapshot or release. -set(DCMTK_ABI_VERSION 14) +set(DCMTK_ABI_VERSION 15) # Package "release" settings (some are currently unused and, therefore, disabled) set(DCMTK_PACKAGE_NAME "dcmtk") -set(DCMTK_PACKAGE_DATE "2018-11-29") +set(DCMTK_PACKAGE_DATE "2019-10-28") set(DCMTK_PACKAGE_VERSION "${DCMTK_MAJOR_VERSION}.${DCMTK_MINOR_VERSION}.${DCMTK_BUILD_VERSION}") set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_MAJOR_VERSION}${DCMTK_MINOR_VERSION}${DCMTK_BUILD_VERSION}) set(DCMTK_PACKAGE_VERSION_SUFFIX "") @@ -57,6 +57,19 @@ set(DCMTK_PACKAGE_VERSION_SUFFIX "") # Shared library version information SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_ABI_VERSION}.${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}") +# Gather information about the employed CMake version's behavior +set(DCMTK_CMAKE_HAS_CXX_STANDARD FALSE) +if(NOT CMAKE_MAJOR_VERSION LESS 3) # CMake versions prior to 3 don't understand VERSION_LESS etc. + if(NOT CMAKE_VERSION VERSION_LESS "3.1.3") + set(DCMTK_CMAKE_HAS_CXX_STANDARD TRUE) + endif() +endif() +define_property(GLOBAL PROPERTY DCMTK_CMAKE_HAS_CXX_STANDARD + BRIEF_DOCS "TRUE iff the CXX_STANDARD property exists." + FULL_DOCS "TRUE for CMake versions since 3.1.3 that evaluate the CXX_STANDARD property and CMAKE_CXX_STANDARD variable." +) +set_property(GLOBAL PROPERTY DCMTK_CMAKE_HAS_CXX_STANDARD ${DCMTK_CMAKE_HAS_CXX_STANDARD}) + # General build options and settings option(BUILD_APPS "Build command line applications and test programs." ON) option(BUILD_SHARED_LIBS "Build with shared libraries." OFF) @@ -65,13 +78,6 @@ mark_as_advanced(BUILD_SINGLE_SHARED_LIBRARY) set(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library postfix for debug builds. Usually left blank.") # add our CMake modules to the module path, but prefer the ones from CMake. list(APPEND CMAKE_MODULE_PATH "${CMAKE_ROOT}/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/${DCMTK_CMAKE_INCLUDE}/CMake/") -# newer CMake versions will warn if a module exists in its and the project's module paths, which is now always -# the case since above line adds CMake's module path to the project's one. It, therefore, doesn't matter whether -# we set the policy to OLD or NEW, since in both cases CMake's own module will be preferred. We just set -# the policy to silence the warning. -if(POLICY CMP0017) - cmake_policy(SET CMP0017 NEW) -endif() if(BUILD_SINGLE_SHARED_LIBRARY) # When we are building a single shared lib, we are building shared libs :-) set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE) @@ -89,6 +95,7 @@ option(DCMTK_WITH_ICU "Configure DCMTK with support for ICU." ON) if(NOT WIN32) option(DCMTK_WITH_WRAP "Configure DCMTK with support for WRAP." ON) endif() +option(DCMTK_WITH_OPENJPEG "Configure DCMTK with support for OPENJPEG." ON) option(DCMTK_ENABLE_PRIVATE_TAGS "Configure DCMTK with support for DICOM private tags coming with DCMTK." OFF) option(DCMTK_WITH_THREADS "Configure DCMTK with support for multi-threading." ON) option(DCMTK_WITH_DOXYGEN "Build API documentation with DOXYGEN." ON) @@ -96,7 +103,6 @@ option(DCMTK_GENERATE_DOXYGEN_TAGFILE "Generate a tag file with DOXYGEN." OFF) option(DCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS "Build with wide char file I/O functions." OFF) option(DCMTK_WIDE_CHAR_MAIN_FUNCTION "Build command line tools with wide char main function." OFF) option(DCMTK_ENABLE_STL "Enable use of native STL classes and algorithms instead of DCMTK's own implementations." OFF) -option(DCMTK_ENABLE_CXX11 "Enable use of native C++11 features (eg. move semantics)." OFF) macro(DCMTK_INFERABLE_OPTION OPTION DESCRIPTION) set("${OPTION}" INFERRED CACHE STRING "${DESCRIPTION}") @@ -116,6 +122,7 @@ DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_STRING "Enable use of STL string.") DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_TYPE_TRAITS "Enable use of STL type traits.") DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_TUPLE "Enable use of STL tuple.") DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_STL_SYSTEM_ERROR "Enable use of STL system_error.") +DCMTK_INFERABLE_OPTION(DCMTK_ENABLE_CXX11 "Enable use of native C++11 features (eg. move semantics).") # Built-in (compiled-in) dictionary enabled on Windows per default, otherwise # disabled. Loading of external dictionary via run-time is, per default, @@ -137,6 +144,8 @@ mark_as_advanced(CMAKE_DEBUG_POSTFIX) mark_as_advanced(FORCE EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH) mark_as_advanced(SNDFILE_DIR DCMTK_WITH_SNDFILE) # not yet needed in public DCMTK mark_as_advanced(DCMTK_GENERATE_DOXYGEN_TAGFILE) +mark_as_advanced(DCMTK_WITH_OPENJPEG) # only needed by DCMJP2K module + if(NOT WIN32) # support for wide char file I/O functions is currently Windows-specific mark_as_advanced(DCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS) @@ -144,6 +153,15 @@ if(NOT WIN32) mark_as_advanced(DCMTK_WIDE_CHAR_MAIN_FUNCTION) endif() +# Enable manpages only for non-Windows systems by default +set(DCMTK_ENABLE_MANPAGES_DOCSTRING "Enable building/installing of manpages.") +if(WIN32) + option(DCMTK_ENABLE_MANPAGES "${DCMTK_ENABLE_MANPAGES_DOCSTRING}" OFF) +else() + option(DCMTK_ENABLE_MANPAGES "${DCMTK_ENABLE_MANPAGES_DOCSTRING}" ON) +endif() +mark_as_advanced(DCMTK_ENABLE_MANPAGES) + enable_testing() #----------------------------------------------------------------------------- @@ -245,9 +263,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") # set project wide flags for compiler and linker if(WIN32) - option(DCMTK_OVERWRITE_WIN32_COMPILER_FLAGS "Overwrite compiler flags with DCMTK's WIN32 package default values." ON) + option(DCMTK_OVERWRITE_WIN32_COMPILER_FLAGS "Overwrite compiler flags with DCMTK's WIN32 package default values." ON) + option(DCMTK_COMPILE_WIN32_MULTITHREADED_DLL "Compile DCMTK using the Multithreaded DLL runtime library." OFF) + if (BUILD_SHARED_LIBS) + set(DCMTK_COMPILE_WIN32_MULTITHREADED_DLL ON) + endif() else() set(DCMTK_OVERWRITE_WIN32_COMPILER_FLAGS OFF) + set(DCMTK_COMPILE_WIN32_MULTITHREADED_DLL OFF) endif() if(DCMTK_OVERWRITE_WIN32_COMPILER_FLAGS AND NOT BUILD_SHARED_LIBS) @@ -288,6 +311,37 @@ if(DCMTK_OVERWRITE_WIN32_COMPILER_FLAGS AND NOT BUILD_SHARED_LIBS) endif() +if(WIN32 AND CMAKE_GENERATOR MATCHES "Visual Studio .*") + # Evaluate the DCMTK_COMPILE_WIN32_MULTITHREADED_DLL option and adjust + # the runtime library setting (/MT or /MD) accordingly + set(CompilerFlags + CMAKE_CXX_FLAGS + CMAKE_CXX_FLAGS_DEBUG + CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_MINSIZEREL + CMAKE_CXX_FLAGS_RELWITHDEBINFO + CMAKE_C_FLAGS + CMAKE_C_FLAGS_DEBUG + CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL + CMAKE_C_FLAGS_RELWITHDEBINFO + ) + + if(DCMTK_COMPILE_WIN32_MULTITHREADED_DLL OR BUILD_SHARED_LIBS) + # Convert any /MT or /MTd option to /MD or /MDd + foreach(CompilerFlag ${CompilerFlags}) + string(REPLACE "/MT" "/MD" ${CompilerFlag} "${${CompilerFlag}}") + set(${CompilerFlag} "${${CompilerFlag}}" CACHE STRING "msvc compiler flags" FORCE) + endforeach() + else() + # Convert any /MD or /MDd option to /MT or /MTd + foreach(CompilerFlag ${CompilerFlags}) + string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") + set(${CompilerFlag} "${${CompilerFlag}}" CACHE STRING "msvc compiler flags" FORCE) + endforeach() + endif() +endif() + if(BUILD_SHARED_LIBS) set(DCMTK_SHARED ON) if(BUILD_SINGLE_SHARED_LIBRARY) @@ -382,6 +436,11 @@ else() # ... for non-Windows systems set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") endif() + # When compiling with IBM xlC, add flags to suppress some noisy C++ warnings + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "XL") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qsuppress=1500-029:1500-030") + endif() + endif() # define libraries and object files that must be linked to most Windows applications @@ -402,8 +461,28 @@ endif() set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") -# determine which flags are required to enable C++11 features (if any) -if(NOT DEFINED DCMTK_CXX11_FLAGS) +# handle CMAKE_CXX_STANDARD and related variables +if(DCMTK_CMAKE_HAS_CXX_STANDARD) + if(NOT DEFINED CMAKE_CXX_STANDARD) + if(DCMTK_ENABLE_CXX11 AND NOT DCMTK_ENABLE_CXX11 STREQUAL "INFERRED") + set(CMAKE_CXX_STANDARD 11) + endif() + endif() + if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD MATCHES "^9[0-9]?$") + set(DCMTK_MODERN_CXX_STANDARD FALSE) + else() + set(DCMTK_MODERN_CXX_STANDARD TRUE) + endif() + define_property(GLOBAL PROPERTY DCMTK_MODERN_CXX_STANDARD + BRIEF_DOCS "TRUE when compiling C++11 (or newer) code." + FULL_DOCS "TRUE when the compiler does support and is configured for C++11 or a later C++ standard." + ) + set_property(GLOBAL PROPERTY DCMTK_MODERN_CXX_STANDARD ${DCMTK_MODERN_CXX_STANDARD}) + if(DEFINED DCMTK_CXX11_FLAGS) + message(WARNING "Legacy variable DCMTK_CXX11_FLAGS will be ignored since CMake now sets the flags based on the CMAKE_CXX_STANDARD variable automatically.") + endif() +elseif(NOT DEFINED DCMTK_CXX11_FLAGS) + # determine which flags are required to enable C++11 features (if any) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") set(DCMTK_CXX11_FLAGS "-std=c++11") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") @@ -418,6 +497,11 @@ if(NOT DEFINED DCMTK_CXX11_FLAGS) set(DCMTK_CXX11_FLAGS "${DCMTK_CXX11_FLAGS}" CACHE STRING "The flags to add to CMAKE_CXX_FLAGS for enabling C++11 (if any).") mark_as_advanced(DCMTK_CXX11_FLAGS) endif() +define_property(GLOBAL PROPERTY DCMTK_MODERN_CXX_STANDARDS + BRIEF_DOCS "Modern C++ standards DCMTK knows about." + FULL_DOCS "The list of C++ standards since C++11 that DCMTK currently has configuration tests for. " +) +set_property(GLOBAL PROPERTY DCMTK_MODERN_CXX_STANDARDS 11 14 17) #----------------------------------------------------------------------------- # Third party libraries diff --git a/CMake/osconfig.h.in b/CMake/osconfig.h.in index f80e4c8b..3918adc1 100644 --- a/CMake/osconfig.h.in +++ b/CMake/osconfig.h.in @@ -225,12 +225,18 @@ /* Define to 1 if you have the `getpwnam' function. */ #cmakedefine HAVE_GETPWNAM @HAVE_GETPWNAM@ +/* Define to 1 if you have the `getrusage' function. */ +#cmakedefine HAVE_GETRUSAGE @HAVE_GETRUSAGE@ + /* Define to 1 if you have the `getsockname' function. */ #cmakedefine HAVE_GETSOCKNAME @HAVE_GETSOCKNAME@ /* Define to 1 if you have the `getsockopt' function. */ #cmakedefine HAVE_GETSOCKOPT @HAVE_GETSOCKOPT@ +/* Define to 1 if you have the `gettimeofday' function. */ +#cmakedefine HAVE_GETTIMEOFDAY @HAVE_GETTIMEOFDAY@ + /* Define to 1 if you have the `getuid' function. */ #cmakedefine HAVE_GETUID @HAVE_GETUID@ @@ -306,9 +312,6 @@ /* Define to 1 if you have the `socket' library (-lsocket). */ #cmakedefine HAVE_LIBSOCKET @HAVE_LIBSOCKET@ -/* Define if libtiff supports LZW compression */ -#define HAVE_LIBTIFF_LZW_COMPRESSION 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@ @@ -393,6 +396,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_SYSTEMINFO_H @HAVE_SYS_SYSTEMINFO_H@ +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_ITERATOR_HEADER @HAVE_ITERATOR_HEADER@ + /* Define to 1 if you have readdir_r */ #cmakedefine HAVE_READDIR_R @HAVE_READDIR_R@ @@ -944,6 +950,9 @@ /* Define if we are compiling with libxml support */ #cmakedefine WITH_LIBXML +/* Define if we are compiling with OpenJPEG support */ +#cmakedefine WITH_OPENJPEG + /* Define if we are compiling with OpenSSL support */ #cmakedefine WITH_OPENSSL @@ -1123,6 +1132,22 @@ typedef unsigned long ulong; DCMTK was configured to use C++11 features, but your compiler does not or was not configured to provide them. #endif +/* Define if we can use C++14 */ +#cmakedefine HAVE_CXX14 @HAVE_CXX14@ + +#if defined(HAVE_CXX14) && defined(__cplusplus) && __cplusplus < 201402L +#error\ +DCMTK was configured to use C++14 features, but your compiler does not or was not configured to provide them. +#endif + +/* Define if we can use C++17 */ +#cmakedefine HAVE_CXX17 @HAVE_CXX17@ + +#if defined(HAVE_CXX17) && defined(__cplusplus) && __cplusplus < 201703L +#error\ +DCMTK was configured to use C++17 features, but your compiler does not or was not configured to provide them. +#endif + /* Define if the compiler supports __alignof__ */ #cmakedefine HAVE_GNU_ALIGNOF @HAVE_GNU_ALIGNOF@ @@ -1180,4 +1205,22 @@ DCMTK was configured to use C++11 features, but your compiler does not or was no /* Define if we are supposed to use STL's system_error */ #cmakedefine HAVE_STL_SYSTEM_ERROR @HAVE_STL_SYSTEM_ERROR@ +/* Define if the input iterator category is supported */ +#cmakedefine HAVE_INPUT_ITERATOR_CATEGORY @HAVE_INPUT_ITERATOR_CATEGORY@ + +/* Define if the input iterator category is supported */ +#cmakedefine HAVE_OUTPUT_ITERATOR_CATEGORY @HAVE_OUTPUT_ITERATOR_CATEGORY@ + +/* Define if the input iterator category is supported */ +#cmakedefine HAVE_FORWARD_ITERATOR_CATEGORY @HAVE_FORWARD_ITERATOR_CATEGORY@ + +/* Define if the input iterator category is supported */ +#cmakedefine HAVE_BIDIRECTIONAL_ITERATOR_CATEGORY @HAVE_BIDIRECTIONAL_ITERATOR_CATEGORY@ + +/* Define if the input iterator category is supported */ +#cmakedefine HAVE_RANDOM_ACCESS_ITERATOR_CATEGORY @HAVE_RANDOM_ACCESS_ITERATOR_CATEGORY@ + +/* Define if the input iterator category is supported */ +#cmakedefine HAVE_CONTIGUOUS_ITERATOR_CATEGORY @HAVE_CONTIGUOUS_ITERATOR_CATEGORY@ + #endif /* !OSCONFIG_H*/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f1e02be..a042e7a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,22 @@ -# Declare project -project(DCMTK) - # Minimum CMake version required -cmake_minimum_required(VERSION 2.8.5) - -# Disables a warning emitted by CMake 3.7.2. The same setting is performed -# again in CMake/dcmtkPrepare.cmake (included below), but the warning is still -# emitted if it is not set here (it only goes away if the policy is set in -# both files). -# We do not entirely understand this behavior, perhaps it is a bug in CMake? -if(POLICY CMP0017) - cmake_policy(SET CMP0017 NEW) +cmake_minimum_required(VERSION 2.8.5 FATAL_ERROR) + +# As of 2018-12-26 DCMTK has been validated to build with CMake 3.13.2 policies. +set(DCMTK_MAX_CMAKE_POLICY_VERSION 3.13.2) + +# Set and use the newest CMake policies that are validated to work +# (VERSION_LESS comparison is only defined for CMake 3 and newer) +if(CMAKE_MAJOR_VERSION LESS 3) + set(DCMTK_CMAKE_POLICY_VERSION "${CMAKE_VERSION}") +elseif(CMAKE_VERSION VERSION_LESS DCMTK_MAX_CMAKE_POLICY_VERSION) + set(DCMTK_CMAKE_POLICY_VERSION "${CMAKE_VERSION}") +else() + set(DCMTK_CMAKE_POLICY_VERSION "${DCMTK_MAX_CMAKE_POLICY_VERSION}") endif() +cmake_policy(VERSION "${DCMTK_CMAKE_POLICY_VERSION}") + +# Declare project +project(DCMTK) # Check the build system include(CMake/dcmtkPrepare.cmake NO_POLICY_SCOPE) diff --git a/COPYRIGHT b/COPYRIGHT index 603c5fb1..13b996d5 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -5,7 +5,7 @@ Unless otherwise specified, the DCMTK software package has the following copyright: /* - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. * * This software and supporting documentation were developed by @@ -478,7 +478,7 @@ The dcmrt sub-package is covered by the following copyright: --------------------------------------------------------------------------- Copyright (C) 2008-2012, OFFIS e.V. and ICSMED AG, Oldenburg, Germany -Copyright (C) 2013-2018, J. Riesmeier, Oldenburg, Germany +Copyright (C) 2013-2019, J. Riesmeier, Oldenburg, Germany All rights reserved. Redistribution and use in source and binary forms, with or without @@ -511,7 +511,7 @@ Parts of the dcmsr sub-package are covered by the following copyright: --------------------------------------------------------------------------- -Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany +Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/INSTALL b/INSTALL index 3d0c87f1..67b396ac 100644 --- a/INSTALL +++ b/INSTALL @@ -9,8 +9,8 @@ PRE-REQUISITES The DICOM toolkit (DCMTK) needs to be compiled with a C++ compiler. We recommend using the GNU C++ compiler in versions higher than 4.2.1 (most of the development for this release was done using GNU C++ 6.3.0 on Debian Linux). -The software is also known to compile using the SUNPro C++ compiler, -Clang and Microsoft Visual Studio. +The software is also known to compile using the SUNPro C++ compiler, Clang and +Microsoft Visual Studio. Compatibility with other C++ compilers is unknown, however, we have tried to keep language demands to a minimum (newer C++ features such as Exceptions and @@ -32,23 +32,21 @@ The DCMTK software can be compiled under a native Microsoft Windows environment The current (minor) release successfully compiles on the following operating system / hardware / compiler combinations: - Windows 7 / Intel x86 / Microsoft Visual C++ 2005 Express (VS 8) Windows 7 / Intel x86 / Microsoft Visual C++ 2008 Express (VS 9) Windows 7 / Intel x86 / Microsoft Visual C++ 2010 Express (VS 10) Windows 7 / Intel x86 / Microsoft Visual C++ 2012 Express (VS 11) Windows 7 / Intel x86 / Microsoft Visual C++ 2013 Express (VS 12) Windows 7 / Intel x86 / Microsoft Visual C++ 2015 Community (VS 14) Windows 7 / Intel x86 / Microsoft Visual C++ 2017 Community (VS 15) - Windows 7 / Intel x86 / MinGW gcc 7.3.0 (i686-w64-mingw32) - Windows 10 / Intel x86 / Microsoft Visual C++ 2015 Community (VS 14) + Windows 7 / Intel x86 / MinGW gcc 7.4.0 (i686-w64-mingw32) Windows 7 / amd64|x86_64 / Microsoft Visual C++ 2010 Express (VS 10) Windows 7 / amd64|x86_64 / Microsoft Visual C++ 2012 Express (VS 11) Windows 7 / amd64|x86_64 / Microsoft Visual C++ 2013 Express (VS 12) Windows 7 / amd64|x86_64 / Microsoft Visual C++ 2015 Community (VS 14) Windows 7 / amd64|x86_64 / Microsoft Visual C++ 2017 Community (VS 15) - Windows 7 / amd64|x86_64 / MinGW gcc 8.2.0 (x86_64-w64-mingw32) - Windows 10 / amd64|x86_64 / Microsoft Visual C++ 2015 Community (VS 14) - Windows 10 / amd64|x86_64 / Microsoft Visual C++ 2017 Community (VS 15) + Windows 7 / amd64|x86_64 / Microsoft Visual C++ 2019 Community (VS 16) + Windows 7 / amd64|x86_64 / MinGW gcc 8.2.1 (x86_64-w64-mingw32) + Windows 10 / amd64|x86_64 / Microsoft Visual C++ 2019 Community (VS 16) Unix (or lookalikes) -------------------- @@ -57,27 +55,30 @@ The current DCMTK software release successfully compiles on the following operating system / hardware / compiler combinations using the instructions given below: - FreeBSD 11.2 / amd64|x86_64 / Clang 6.0.0 - Linux 4.19.4 / amd64|x86_64 / Clang 7.0.0 (Arch Linux) - Linux 4.19.4 / amd64|x86_64 / GNU gcc 8.2.1 (Arch Linux) - Linux 3.10.0 / amd64|x86_64 / Clang 3.4.2 (CentOS 7.3) - Linux 3.10.0 / amd64|x86_64 / GNU gcc 4.8.5 (CentOS 7.3) + FreeBSD 12.0 / amd64|x86_64 / Clang 6.0.1 Linux 3.2.0 / amd64|x86_64 / GNU gcc 4.4.7 (Debian 7.11) - Linux 3.2.0 / amd64|x86_64 / GNU gcc 4.8.4 (Debian 7.11) - Linux 4.9.0 / Intel x86 / Clang 3.8.1 (Debian 9.6) - Linux 4.9.0 / Intel x86 / GNU gcc 6.3.0 (Debian 9.6) + Linux 3.10.0 / amd64|x86_64 / Clang 3.4.2 (CentOS 7.7) + Linux 3.10.0 / amd64|x86_64 / GNU gcc 4.8.5 (CentOS 7.7) Linux 3.13.0 / amd64|x86_64 / Clang 3.9.1 (Linux Mint 17.3) Linux 3.13.0 / amd64|x86_64 / GNU gcc 4.8.5 (Linux Mint 17.3) Linux 3.13.0 / amd64|x86_64 / GNU gcc 5.5.0 (Linux Mint 17.3) Linux 3.13.0 / amd64|x86_64 / GNU gcc 6.5.0 (Linux Mint 17.3) - NetBSD 8.0 / amd64|x86_64 / Clang 5.0.2 - NetBSD 8.0 / amd64|x86_64 / GNU gcc 5.5.0 - OpenBSD 6.0 / amd64|x86_64 / Clang 3.8.0 - OpenBSD 6.0 / amd64|x86_64 / GNU gcc 4.2.1 - OpenIndiana / Intel x86 / GNU gcc 7.3.0 (OpenIndiana 2018.04) + Linux 3.13.0 / amd64|x86_64 / GNU gcc 8.3.0 (Linux Mint 17.3) + Linux 4.19.0 / Intel x86 / Clang 7.0.1 (Debian 10) + Linux 4.19.0 / Intel x86 / GNU gcc 8.3.0 (Debian 10) + Linux 4.19.0 / amd64|x86_64 / Clang 7.0.1 (Debian 10) + Linux 4.19.0 / amd64|x86_64 / GNU gcc 8.3.0 (Debian 10) + Linux 5.0.0 / amd64|x86_64 / gcc 8.3.0 (Ubuntu Linux) + Linux 5.3.7 / amd64|x86_64 / Clang 9.0.0 (Arch Linux) + Linux 5.3.7 / amd64|x86_64 / GNU gcc 9.2.0 (Arch Linux) + MacOS X 10.15 / amd64|x86_64 / Apple Clang 11.0.0 + MacOS X 10.15 / amd64|x86_64 / GNU gcc 9.2.0 + OpenBSD 6.5 / amd64|x86_64 / Clang 7.0.1 + OpenBSD 6.5 / amd64|x86_64 / GNU gcc 4.2.1 + OpenIndiana / Intel x86 / GNU gcc 8.3.0 (OpenIndiana 2019.04) Solaris 11.3 / Intel x86 / GNU gcc 4.8.2 - Solaris 11.3 / Intel x86 / SunPro CC 5.14 (Oracle Dev. Studio 12.5) - Solaris 11.3 / Intel x86 / SunPro CC 5.15 (Oracle Dev. Studio 12.6) + Solaris 11.3 / Intel x86 / SunPro CC 5.14 (Oracle Developer Studio 12.5) + Solaris 11.3 / Intel x86 / SunPro CC 5.15 (Oracle Developer Studio 12.6) Cross Compiling --------------- @@ -93,15 +94,23 @@ when targeting Android or Windows respectively. Other versions of Android will most likely also work, but the above mentioned one is currently the only one that is being regularly tested. -Of course, GNU Autoconf also provides cross compiling support and using it for -various platforms might also work but probably not out of the box, i.e. some -customization is needed and you have to find a way to provide the information -from the configuration tests that need to be run on the target hardware -yourself. - Other Platforms --------------- +The previous minor release DCMTK 3.6.4 was also tested on the following +platforms that may still work, but were not tested again for this minor release: + + Linux 3.2.0 / amd64|x86_64 / GNU gcc 4.8.4 (Debian 7.11) + Linux 3.16.0 / armv7|armhf / GNU gcc 4.9.4 (Debian 8) + Linux 4.19.4 / amd64|x86_64 / Clang 7.0.0 (Arch Linux) + Linux 4.19.4 / amd64|x86_64 / GNU gcc 8.2.1 (Arch Linux) + NetBSD 8.0 / amd64|x86_64 / Clang 5.0.2 + NetBSD 8.0 / amd64|x86_64 / GNU gcc 5.5.0 + Windows 7 / Intel x86 / Microsoft Visual C++ 2005 Express (VS 8) + Windows 10 / Intel x86 / Microsoft Visual C++ 2015 Community (VS 14) + Windows 10 / amd64|x86_64 / Microsoft Visual C++ 2015 Community (VS 14) + Windows 10 / amd64|x86_64 / Microsoft Visual C++ 2017 Community (VS 15) + The previous minor release DCMTK 3.6.3 was also tested on the following platforms that may still work, but were not tested again for this minor release: @@ -155,9 +164,9 @@ cryptographic routines and the TLS protocol implementation. This release of DCMTK requires OpenSSL release 1.0.1 or newer, since older versions do not support the TLS 1.2 protocol required by the more recent -DICOM security profiles. We recommend the use of OpenSSL 1.0.2 or newer, +DICOM security profiles. We recommend the use of OpenSSL 1.0.2 or newer, however, since some optional functions recommended by RFC 7525 / BCP 195 -are only available starting with this OpenSSL release. Furthermore, users +are only available starting with this OpenSSL release. Furthermore, users should make care that the most recent OpenSSL patch level is applied. When using CMake, if support for security enhancements is desired, a compiled @@ -167,11 +176,6 @@ and enables support automatically if present. By default, DCMTK checks the standard paths on Unix platforms. For Windows platforms, check the discussion on CMake below. -When using Autoconf, if support for security enhancements is desired, a compiled -version of the OpenSSL libraries and include files must be available during -compilation of DCMTK. By default, DCMTK checks whether OpenSSL is installed -in the standard path and enables support automatically if present. - ZLIB SUPPORT ============ @@ -185,11 +189,6 @@ releases 1.2.8 to 1.2.11, although other releases may work as well. When using CMake, a compiled version of the zlib libraries and include files must be available during compilation of DCMTK. See discussion on CMake below. -When using Autoconf, if support for zlib compression is desired, a compiled -version of the zlib library and include files must be available during -compilation of DCMTK. By default, DCMTK checks whether zlib is installed in -the standard path and enables support automatically if present. - LIBTIFF SUPPORT =============== @@ -205,12 +204,6 @@ incompatible API changes in libtiff. When using CMake, a compiled version of the libtiff libraries and include files must be available during compilation of DCMTK. See discussion on CMake below. -When using Autoconf, if support for TIFF export is desired, a compiled version -of the libtiff libraries and include files must be available during compilation -of DCMTK, and the libtiff support must be switched on explicitly. By default, -DCMTK checks whether libtiff is installed in the standard path and enables -support automatically if present. - LIBPNG SUPPORT ============== @@ -218,18 +211,12 @@ LIBPNG SUPPORT Starting with release 3.5.3, DCMTK supports the conversion of DICOM images to PNG. DCMTK relies on the libpng toolkit (www.libpng.org) for this purpose. This release of DCMTK is known to compile with the current libpng releases -1.2.50 to 1.6.35, although other releases may work as well. +1.2.50 to 1.6.37, although other releases may work as well. When using CMake, a compiled version of the libpng libraries and include files must be available during compilation of DCMTK. See discussion on CMake below. -When using Autoconf, if support for PNG export is desired, a compiled version of -the libpng libraries and include files must be available during compilation of -DCMTK, and the libpng support must be switched on explicitly. By default, DCMTK -checks whether libpng is installed in the standard path and enables support -automatically if present. It should be noted that libpng requires zlib. - LIBXML2 SUPPORT =============== @@ -237,17 +224,12 @@ LIBXML2 SUPPORT Starting with release 3.5.3, DCMTK supports the conversion of XML documents to DICOM files. DCMTK relies on the libxml2 toolkit (www.libxml.org) for this purpose. This release of DCMTK is known to compile with the libxml2 releases -2.9.4 to 2.9.7, although other releases may work as well. +2.9.4 to 2.9.9, although other releases may work as well. When using CMake, if support for XML import is desired, a compiled version of the libxml2 (and possibly iconv) libraries and include files must be available during compilation of DCMTK. See discussion on CMake below. -When using Autoconf, if support for XML import is desired, a compiled version of -the libxml2 (and possibly iconv) libraries and include files must be available -during compilation of DCMTK. By default, DCMTK checks whether libxml2 is -installed in the standard path and enables support automatically if present. - TCP WRAPPER (LIBWRAP) SUPPORT ============================= @@ -263,11 +245,6 @@ When using CMake, if support for TCP wrappers is desired, a compiled version of the libwrap library and include file must be available during compilation of DCMTK. See discussion on CMake below. -When using Autoconf, if support for TCP wrappers is desired, a compiled version -of the libwrap library and include file must be available during -compilation of DCMTK. By default, DCMTK checks whether libwrap is installed -in the standard path and enables support automatically if present. - Since DCMTK uses the TCP wrappers from C++ code, an ANSI C compatible header file is required. The official release 7.6 of the TCP wrappers library is not ANSI C compatible and does not work with DCMTK (i.e. will not be @@ -306,18 +283,12 @@ When using CMake, a compiled version of the libiconv and libcharset libraries and include files must be available during compilation of DCMTK. See discussion on CMake below. -When using Autoconf, if support for libiconv conversion is desired, a compiled -version of the libiconv library and include files must be available during -compilation of DCMTK. Please note that DCMTK also needs the bundled copy of -libcharset. By default, DCMTK checks whether libiconv and libcharset are -installed in the standard path and enables support automatically if present. - ICU SUPPORT ----------- DCMTK supports the International Components for Unicode (ICU) library as an alternative to the above mentioned libiconv. This release of DCMTK is known to -compile with the ICU releases 59.1 to 63.1, although other releases may work as +compile with the ICU releases 59.1 to 65.1, although other releases may work as well. The ICU may be easier to integrate on some more modern Linux distributions @@ -334,12 +305,6 @@ When using CMake, if support for character set conversion using ICU is desired, a compiled version of the ICU libraries and include files must be available during compilation of DCMTK. See discussion on CMake below. -When using Autoconf, if support for character set conversion using ICU is -desired, a compiled version of the ICU libraries and include files must be -available during compilation of DCMTK. By default, DCMTK checks whether ICU is -installed in the standard path and enables support automatically if present. - - Support for iconv provided in the C standard library ---------------------------------------------------- @@ -395,29 +360,35 @@ respectively: use "--enable-stl-", "--disable-stl-" and/or "--disable-stl-vector" or "-DDCMTK_ENABLE_STL_STRING=ON". -C++11 SUPPORT -============= - -DCMTK can be configured to use several C++11 features (e.g. move semantics, -variadic templates and the like) instead of its own workarounds and fallback -implementations. This can be achieved with the "--enable-cxx11" argument -(Autoconf) or by setting "DCMTK_ENABLE_CXX11" to "ON" (CMake). - -Enabling C++11 will change some parts of DCMTK's API, so a C++11 build of DCMTK -is potentially incompatible with a classic build of DCMTK. This setting is, -therefore, stored in "config/include/dcmtk/config/osconfig.h" and verified when -compiling DCMTK itself or any program that includes it. +SUPPORT FOR MODERN C++ STANDARDS +================================ -Enabling C++11 support will not forcibly enable using the C++11 features but -instead trigger running some configuration tests and only truly enable it if -all of them pass. +DCMTK can be configured to use several features of modern C++ standards, eg. +(e.g. C++11 move semantics, variadic templates and the like) instead of its own +workarounds and fallback implementations. This can be achieved using CMake's +variables "CMAKE_CXX_STANDARD" and "CMAKE_CXX_STANDARD_REQUIRED". +The previous mechanism only handled C++11 and is available on old versions of +CMake (versions prior 3.1.3): set "DCMTK_ENABLE_CXX11" to "ON". For Autoconf, +use the "--enable-cxx11" argument. Both the "DCMTK_ENABLE_CXX11" variable and +Autoconf support are now deprecated and will be removed in a future release. + +Enabling e.g. C++11 will change some parts of DCMTK's API, so a C++11 build of +DCMTK is potentially incompatible with a classic build of DCMTK. This setting +is, therefore, stored in "config/include/dcmtk/config/osconfig.h" and verified +when compiling DCMTK itself or any program that includes it. + +Setting CMAKE_CXX_STANDARD to '11' or some newer C++ standard will not forcibly +enable DCMTK to use the respective features but instead trigger running some +configuration tests and only truly enable the features that are really +supported (e.g. std::error_code is still not implemented as intended on newer +versions of Visual Studio, so we keep using DCMTK's own implementation there). Please note that this setting does not depend on enabling the STL features but not all combinations (e.g. enabling C++11 but disabling std::string) may work. BUILDING -=========================== +======== CMake is now the default tool for configuring a DCMTK build. CMake is a cross-platform, open-source make system which can be used to control the @@ -428,8 +399,8 @@ directories. In detail, these "CMakeLists.txt" files will serve as an input to CMake which will generate suitable build files for all of DCMTK's projects from these files. -DCMTK 3.6.4 requires CMake version 2.8.5 or later. We recommend using the -latest stable release of CMake (currently version 3.10.2) since newer versions +DCMTK 3.6.5 requires CMake version 2.8.5 or later. We recommend using the +latest stable release of CMake (currently version 3.15.4) since newer versions of CMake often provide better output in case of errors and are generally easier to use (for example by providing better support for detecting the availability of third party libraries). If possible, use the CMake version your operating @@ -513,7 +484,7 @@ CMake, perform the following steps: 1. Go Start -> Programs -> CMake -> "CMake" or "CMake (cmake-gui)" to start the CMake utility through which the configuration can be done. 2. In the entry field "Where is the source code:" enter the directory in which - the DCMTK source code resides, e.g. "C:\dcmtk-3.6.4". + the DCMTK source code resides, e.g. "C:\dcmtk-3.6.5". 3. In the entry field "Where to build the binaries:" enter the directory in which the libraries and binaries are to be built, e.g. "C:\dcmtk-msvc15". 4. In the combobox "Build for:" or "Specify the generator for this project:" @@ -532,7 +503,7 @@ CMake, perform the following steps: libpng support: set "DCMTK_WITH_PNG" to "ON" and - set "WITH_LIBPNGINC" e.g. to "C:\libpng-1.6.35" + set "WITH_LIBPNGINC" e.g. to "C:\libpng-1.6.37" libtiff support: set "DCMTK_WITH_TIFF" to "ON" and @@ -540,7 +511,7 @@ CMake, perform the following steps: OpenSSL support: set "DCMTK_WITH_OPENSSL" to "ON" and - set "WITH_OPENSSLINC" e.g. to "C:\openssl-1.1.0j" + set "WITH_OPENSSLINC" e.g. to "C:\openssl-1.1.1d" zlib support: set "DCMTK_WITH_ZLIB" to "ON" and @@ -667,19 +638,59 @@ https://cmake.org/cmake/help/latest/module/FindZLIB.html . The typical way to build DCMTK on Unix like systems with CMake is as follows (if not using the GUI, in that case look at the description for Windows above): - mkdir dcmtk-gcc-`g++ -dumpversion` - cd dcmtk-gcc- - cmake ../dcmtk-3.6.4 + mkdir dcmtk-3.6.5-build + cd dcmtk-3.6.5-build + cmake ../dcmtk-3.6.5 make -j8 - make DESTDIR=../dcmtk-3.6.4-install install + make DESTDIR=../dcmtk-3.6.5-install install The above commands assume that the DCMTK source code was extracted to the -current working directory into a folder named dcmtk-3.6.4 and that the GNU gcc -compiler will be used (note that clang++ -dumpversion will give wrong results). -DCMTK will be configured using CMake with the default options, detecting and -including all available support libraries and then compiled using eight CPU -cores (adjust as needed). The result will be installed to the directory -"dcmtk-3.6.4-install" next to the source code directory. +current working directory into a folder named dcmtk-3.6.5. DCMTK will be +configured using CMake with the default options, detecting and including all +available support libraries and then compiled using eight CPU cores +('make -j8', adjust as needed). The result will be installed to the directory +"dcmtk-3.6.5-install" next to the source code directory. + +If you want to modify your build configuration, like enabling or disabling +some features of DCMTK (e.g. PNG support), or if you need to modify the +predefined build-variables, you can use the curses based cmake configuration +tool 'ccmake'. First, create the initial build setup (system check) and then +call ccmake: + + mkdir dcmtk-3.6.5-build + cd dcmtk-3.6.5-build + cmake ../dcmtk-3.6.5 + ccmake ../dcmtk-3.6.5 + +Now you can modify the configuration values. Please see the help on the bottom +of the screen. When finished, press 'c' to generate a new build configuration, +then quit ccmake. Now you can continue to build by calling 'make' etc. + +If you already know the variable names, types and values to set, you can skip +the 'ccmake' step above and can call 'cmake' directly with the values set. +Example for a build with TCP wrapper disabled: + + mkdir dcmtk-3.6.5-build + cd dcmtk-3.6.5-build + cmake -DDCMTK_WITH_WRAP:BOOL=FALSE ../dcmtk-3.6.5 + ... + +The format is NAME:TYPE=VALUE. Use 'ccmake' to find out the variable names and +their types (BOOL with TRUE/FALSE or STRING). Some of the more important +variables are: + + - BUILD_APPS: Build the DCMTK command line tools? Default: ON. + - BUILD_SHARED_LIBS: Build the DCMTK libraries as shared libraries? + Default: OFF. + - CMAKE_BUILD_TYPE: Debug or Release build, default: Release. + - CMAKE_INSTALL_PREFIX: Installation prefix, default: /usr/local. + - DCMTK_ENABLE_BUILTIN_DICTIONARY: Activate the built-in DICOM data + dictionary? Default: ON on Windows, OFF on Linux/Posix. + - DCMTK_ENABLE_CXX11: Assume the compiler is C++11 compliant. Default: OFF. + - DCMTK_ENABLE_STL: Replace DCMTK's OFString, OFList, OFVector etc. by + the STL classes std::string, std::list, std::vector etc. Default: OFF. + - OPENSSL_ROOT_DIR: Directory where OpenSSL is installed. + Default: search in standard directories for headers and libraries. HTML DOCUMENTATION AND MAN PAGES @@ -688,7 +699,7 @@ HTML DOCUMENTATION AND MAN PAGES Most DCMTK modules have been documented with Doxygen (www.doxygen.org), a free source code documentation system similar to Javadoc. Unix users who have Doxygen installed can create a hypertext documentation with "make html" in the -"dcmtk-3.6.4" or "doxygen" directory; Windows and other CMake users should +"dcmtk-3.6.5" or "doxygen" directory; Windows and other CMake users should build the "DOXYGEN" subproject. A project file for Microsoft's HTML Help Workshop can also be generated allowing to create a single CHM file (compressed HTML) from the documentation. Other output formats (e.g. LaTeX) can be enabled @@ -760,20 +771,24 @@ will build the test runner for each module as "/tests/tests". CMake will add the module name as a prefix to this file's name, e.g. "ofstd_tests". For more information, call this program with the --help option. + BUILDING (Unix with Autoconf) ============================= Configuring a DCMTK build with GNU Autoconf has been deprecated with DCMTK -release 3.6.4 and will be removed in future releases. However, you might still -use Autoconf with this release if you prefer it for whatever reason: - -You do not need to obtain GNU Autoconf to compile and install this software. -All the necessary configure scripts are included in this distribution. The -configure scripts examine your system capabilities and automatically generate -include files and Makefiles. +release 3.6.5 and will be removed in future releases. In the current release, +the "configure" script in DCMTK's top-level main directory has been removed +as the final warning for users of the Autoconf toolchain. If you prefer to +build DCMTK with Autoconf, however, this is still possible. Perform the +following steps from the top-level (dcmtk-3.6.5) directory to compile and +install the software: + +Step 0: + cd config + ./rootconf + cd .. -Perform the following steps from the top-level (dcmtk-3.6.4) directory to -compile and install the software: +Step 0 creates the configure script in DCMTK's top-level directory. Step 1: ./configure --ignore-deprecation @@ -796,15 +811,15 @@ in which OpenSSL is installed. This is usually the directory that has been used as --prefix when compiling and installing OpenSSL. For example, if you wish to enable the security enhancements, and OpenSSL is -installed in "/usr/local/apps/openssl-1.1.0j", then you should start configure +installed in "/usr/local/apps/openssl-1.1.1d", then you should start configure as: ./configure --ignore-deprecation - --with-opensslinc=/usr/local/apps/openssl-1.1.0j + --with-opensslinc=/usr/local/apps/openssl-1.1.1d Configure will assume that the OpenSSL include files are installed in -"/usr/local/apps/openssl-1.1.0g/include" and will expect the library in -"/usr/local/apps/openssl-1.1.0g/lib". Appropriate options will be passed to +"/usr/local/apps/openssl-1.1.1d/include" and will expect the library in +"/usr/local/apps/openssl-1.1.1d/lib". Appropriate options will be passed to the compiler and the linker. Support for zlib, libtiff, libpng, libxml2, libwrap and libiconv can be enabled @@ -814,12 +829,12 @@ path): ./configure --ignore-deprecation --with-libzlibinc=/usr/local/apps/zlib-1.2.11 --with-libtiffinc=/usr/local/apps/libtiff-4.0.10 - --with-libpnginc=/usr/local/apps/libpng-1.6.35 - --with-libxmlinc=/usr/local/apps/libxml2-2.9.7 + --with-libpnginc=/usr/local/apps/libpng-1.6.37 + --with-libxmlinc=/usr/local/apps/libxml2-2.9.9 --with-libwrapinc=/usr/local/apps/tcp_wrappers-7.6 --with-libiconvinc=/usr/local/apps/libiconv-1.15 - --with-libicuinc=/usr/local/apps/icu-63.1 + --with-libicuinc=/usr/local/apps/icu-65.1 Different configure options can be combined in any order. configure --help will print a list of all existing configure options. configure --help=short @@ -885,8 +900,8 @@ following commands: This generates a new Makefile and configure script in the top-level toolkit directory. -Solving configuration and compilation problems ----------------------------------------------- +Solving configuration and compilation problems with Autoconf +------------------------------------------------------------ The configure script might not be able to guess the correct compiler and compiler flags to use. For example, we have noticed that use of the -pedantic @@ -916,7 +931,7 @@ See also the FAQ at https://forum.dcmtk.org/faq for more hints. Have fun. -M. Eichelberg, J. Riesmeier, M. Onken, J. Schlamelcher +M. Eichelberg, J. Riesmeier, M. Onken, J. Schlamelcher, P. Arizpe Gomez DCMTK Development Team, Oldenburg, Germany. -Last revised: 2018-11-29 (Schlamelcher) +Last revised: 2019-10-28 (Schlamelcher) diff --git a/README b/README index 452a5de1..5dcb0ff6 100644 --- a/README +++ b/README @@ -41,7 +41,8 @@ questions please consult the FAQ: http://forum.dcmtk.org/faq/ -There is also a Wiki system where additional information can be found: +In addition to the API documentation, there is also a Wiki system where +further information (e.g. HOWTOs) can be found: http://support.dcmtk.org/wiki/ diff --git a/README.md b/README.md new file mode 100644 index 00000000..51844783 --- /dev/null +++ b/README.md @@ -0,0 +1,37 @@ +# DCMTK + +This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard. + +DCMTK contains the following sub-packages, each in its own sub-directory: + +- **config** - configuration utilities for DCMTK +- **dcmdata** - a data encoding/decoding library and utility apps +- **dcmfg** - a library for working with functional groups +- **dcmimage** - adds support for color images to dcmimgle +- **dcmimgle** - an image processing library and utility apps +- **dcmiod** - a library for working with information objects and modules +- **dcmjpeg** - a compression/decompression library and utility apps +- **dcmjpls** - a compression/decompression library and utility apps +- **dcmnet** - a networking library and utility apps +- **dcmpmap** - a library for working with parametric map objects +- **dcmpstat** - a presentation state library and utility apps +- **dcmqrdb** - an image database server +- **dcmrt** - a radiation therapy library and utility apps +- **dcmseg** - a library for working with segmentation objects +- **dcmsign** - a digital signature library and utility apps +- **dcmsr** - a structured reporting library and utility apps +- **dcmtls** - security extensions for the network library +- **dcmtract** - a library for working with tractography results +- **dcmwlm** - a modality worklist database server +- **oflog** - a logging library based on log4cplus +- **ofstd** - a library of general purpose classes + +Each sub-directory (except _config_) contains further sub-directories for application source code (_apps_), library source code (_libsrc_), library include files (_include_), configuration data (_etc_), documentation (_docs_), sample and support data (_data_) as well as test programs (_tests_). + +To build and install the DCMTK package see the [INSTALL](INSTALL) file. For copyright information see the [COPYRIGHT](COPYRIGHT) file. For information about the history of this software see the [HISTORY](HISTORY) file. For answers to frequently asked questions please consult the [FAQ](http://forum.dcmtk.org/faq/). + +In addition to the API documentation, which is also available [online](https://support.dcmtk.org/docs/), there is a [Wiki](http://support.dcmtk.org/wiki/) system where further information (e.g. HOWTOs) can be found. + +If you find bugs or other problems with this software, we would appreciate hearing about them. Please send electronic mail to: bugs/at/dcmtk/dot/org + +Please try to describe the problem in detail and if possible give a suggested fix. For general questions on how to compile, install or use the toolkit we recommend the [public discussion forum](http://forum.dcmtk.org/). diff --git a/VERSION b/VERSION index 0f44168a..d15b8b06 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.6.4 +3.6.5 diff --git a/config/aclocal.m4 b/config/aclocal.m4 index fcf888f6..4641a4c0 100644 --- a/config/aclocal.m4 +++ b/config/aclocal.m4 @@ -57,7 +57,7 @@ dnl #undef HAVE_PROTOTYPE_GETHOSTID dnl AC_CHECK_PROTOTYPE(FUNCTION, HEADER-FILE..., ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) AC_DEFUN(AC_CHECK_PROTOTYPE, [AC_MSG_CHECKING([ifelse([$2], , [predefined prototype for $1], [prototype for $1 (in $2)])]) -AH_TEMPLATE(AS_TR_CPP(HAVE_PROTOTYPE_$1), [Define if your system has a prototype for $1 in $2]) +AH_TEMPLATE(AS_TR_CPP(HAVE_PROTOTYPE_$1), [Define if your system has a prototype for $1 in $2.]) ifelse([$3], , :, [$3]) ifelse([$2], , [ac_includes="" @@ -112,7 +112,7 @@ dnl already been found using the AC_CHECK_HEADERS(header) macro. dnl AC_CHECK_COMPILES(FUNCTION, HEADER-FILE..., CODE, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) AC_DEFUN(AC_CHECK_COMPILES, [AC_MSG_CHECKING([ifelse([$2], , [for $1], [for $1 (in $2)])]) -AH_TEMPLATE(AS_TR_CPP(HAVE_PROTOTYPE_$1), [Define if your system has a prototype for $1 in $2]) +AH_TEMPLATE(AS_TR_CPP(HAVE_PROTOTYPE_$1), [Define if your system has a prototype for $1 in $2.]) ifelse([$2], , [ac_includes="" ], [ac_includes="" @@ -152,7 +152,7 @@ dnl AC_CHECK_DECLARATION(FUNCTION, C-HEADER-FILE..., C++-HEADER-FILE..., ACTION- AC_DEFUN(AC_CHECK_DECLARATION, [ AC_MSG_CHECKING([ifelse([$2 $3], , [predefined type $1], [ifelse([$2], , [declaration for $1 (in $3)], [ifelse([$3], , [declaration for $1 (in $2)], [declaration for $1 (in $2 $3)])])])]) -AH_TEMPLATE(AS_TR_CPP(HAVE_DECLARATION_$1), [Define if your system has a declaration for $1 in $2 $3]) +AH_TEMPLATE(AS_TR_CPP(HAVE_DECLARATION_$1), [Define if your system has a declaration for $1 in $2 $3.]) ifelse([$2], , [ac_includes="" ], [ac_includes="" @@ -217,7 +217,7 @@ AC_DEFUN(AC_CHECK_INTP_SELECT, [AC_MSG_CHECKING([ifelse([$1], , [if select() needs int* parameters], [if select() needs int* parameters (in $1)])]) AH_TEMPLATE([HAVE_INTP_SELECT], [Define if your system declares argument 2-4 of select() - as int * instead of struct fd_set *]) + as int * instead of struct fd_set *.]) ifelse([$1], , [ac_includes="" ], [ac_includes="" @@ -322,7 +322,7 @@ dnl standard name space. dnl AC_CHECK_STD_NAMESPACE AC_DEFUN(AC_CHECK_STD_NAMESPACE, [AC_MSG_CHECKING([for C++ standard namespace]) -AH_TEMPLATE([HAVE_STD_NAMESPACE], [Define if ANSI standard C++ includes use std namespace]) +AH_TEMPLATE([HAVE_STD_NAMESPACE], [Define if ANSI standard C++ includes use std namespace.]) AC_CACHE_VAL(ac_cv_check_std_namespace, [AC_TRY_COMPILE_AND_LINK([ #include @@ -351,7 +351,7 @@ dnl inline, no template methods and no typedefs in the class dnl AC_CHECK_CLASS_TEMPLATE AC_DEFUN(AC_CHECK_CLASS_TEMPLATE, [AC_MSG_CHECKING([for C++ class template]) -AH_TEMPLATE([HAVE_CLASS_TEMPLATE], [Define if your C++ compiler can work with class templates]) +AH_TEMPLATE([HAVE_CLASS_TEMPLATE], [Define if your C++ compiler can work with class templates.]) AC_CACHE_VAL(ac_cv_check_class_template, [AC_TRY_COMPILE_AND_LINK([ template @@ -392,7 +392,7 @@ dnl using function templates. dnl AC_CHECK_FUNCTION_TEMPLATE AC_DEFUN(AC_CHECK_FUNCTION_TEMPLATE, [AC_MSG_CHECKING([for C++ function template]) -AH_TEMPLATE([HAVE_FUNCTION_TEMPLATE], [Define if your C++ compiler can work with function templates]) +AH_TEMPLATE([HAVE_FUNCTION_TEMPLATE], [Define if your C++ compiler can work with function templates.]) AC_CACHE_VAL(ac_cv_check_function_template, [AC_TRY_COMPILE_AND_LINK([ template @@ -424,7 +424,7 @@ dnl using static methods in template classes dnl AC_CHECK_STATIC_TEMPLATE_METHOD AC_DEFUN(AC_CHECK_STATIC_TEMPLATE_METHOD, [AC_MSG_CHECKING([for C++ static methods in class templates]) -AH_TEMPLATE([HAVE_STATIC_TEMPLATE_METHOD], [Define if your C++ compiler can work with static methods in class templates]) +AH_TEMPLATE([HAVE_STATIC_TEMPLATE_METHOD], [Define if your C++ compiler can work with static methods in class templates.]) AC_CACHE_VAL(ac_cv_check_static_template_method, [AC_TRY_COMPILE_AND_LINK([ void additive(int & i) @@ -465,7 +465,7 @@ dnl template<> int classname::functionname() dnl AC_CHECK_EXPLICIT_TEMPLATE_SPECIALIZATION AC_DEFUN(AC_CHECK_EXPLICIT_TEMPLATE_SPECIALIZATION, [AC_MSG_CHECKING([for C++ explicit template specialization syntax]) -AH_TEMPLATE([HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION], [Define if your C++ compiler supports the explicit template specialization syntax]) +AH_TEMPLATE([HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION], [Define if your C++ compiler supports the explicit template specialization syntax.]) AC_CACHE_VAL(ac_cv_check_explicit_template_specialization, [AC_TRY_COMPILE([ template @@ -575,7 +575,7 @@ dnl AC_CHECK_POLL_H([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) AC_DEFUN(AC_CHECK_POLL_H, [ AC_MSG_CHECKING([for usable poll.h]) -AH_TEMPLATE(AS_TR_CPP(DCMTK_HAVE_POLL), [Define if your system has a usable ]) +AH_TEMPLATE(AS_TR_CPP(DCMTK_HAVE_POLL), [Define if your system has a usable .]) AC_CACHE_VAL(ac_cv_header_poll_h, [ case "${host}" in @@ -647,7 +647,7 @@ AC_DEFUN(AC_CHECK_INTP_ACCEPT, [AC_MSG_CHECKING([ifelse([$1], , [if accept() needs int* parameters], [if accept() needs int* parameters (in $1)])]) AH_TEMPLATE([HAVE_INTP_ACCEPT], [Define if your system declares argument 3 of accept() - as int * instead of size_t * or socklen_t *]) + as int * instead of size_t * or socklen_t *.]) ifelse([$1], , [ac_includes="" ], [ac_includes="" @@ -796,7 +796,7 @@ dnl AC_MY_C_CONST works like the standard script AC_C_CONST dnl but defines HAVE_C_CONST instead of redefining "const" directly. AC_DEFUN(AC_MY_C_CONST, -[AH_TEMPLATE([HAVE_C_CONST], [Define if "const" is supported by the C compiler]) +[AH_TEMPLATE([HAVE_C_CONST], [Define if "const" is supported by the C compiler.]) dnl This message is consistent in form with the other checking messages, dnl and with the result message. AC_CACHE_CHECK([for working const], ac_cv_my_c_const, @@ -857,7 +857,7 @@ dnl AC_MY_C_CHAR_UNSIGNED works like the standard script AC_C_CHAR_UNSIGNED dnl but defines C_CHAR_UNSIGNED instead of __CHAR_UNSIGNED__. AC_DEFUN(AC_MY_C_CHAR_UNSIGNED, -[AH_TEMPLATE([C_CHAR_UNSIGNED], [Define if char is unsigned on the C compiler]) +[AH_TEMPLATE([C_CHAR_UNSIGNED], [Define if char is unsigned on the C compiler.]) AC_CACHE_CHECK(whether char is unsigned, ac_cv_my_c_char_unsigned, [if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. @@ -1019,7 +1019,7 @@ AC_DEFUN(AC_CHECK_INTP_GETSOCKOPT, [AC_MSG_CHECKING([ifelse([$1], , [if getsockopt() needs int* parameters], [if getsockopt() needs int* parameters (in $1)])]) AH_TEMPLATE([HAVE_INTP_GETSOCKOPT], [Define if your system declares argument 5 of getsockopt() - as int * instead of size_t * or socklen_t]) + as int * instead of size_t * or socklen_t.]) ifelse([$1], , [ac_includes="" ], [ac_includes="" @@ -1084,7 +1084,7 @@ dnl AC_CHECK_ELLIPSE_SIGNAL_HANDLER(HEADER-FILE..., ACTION-IF-FOUND [, ACTION-IF AC_DEFUN(AC_CHECK_ELLIPSE_SIGNAL_HANDLER, [AC_MSG_CHECKING([ifelse([$1], , [if signal() callback needs ellipse], [if signal() callback needs ellipse (in $1)])]) -AH_TEMPLATE([SIGNAL_HANDLER_WITH_ELLIPSE], [Define if signal handlers need ellipse (...) parameters]) +AH_TEMPLATE([SIGNAL_HANDLER_WITH_ELLIPSE], [Define if signal handlers need ellipse (...) parameters.]) ifelse([$1], , [ac_includes="" ], [ac_includes="" @@ -1152,7 +1152,7 @@ dnl use C++ language features in . dnl AC_INCLUDE_MATH_H_AS_CXX(HEADER-FILE..., ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) AC_DEFUN(AC_INCLUDE_MATH_H_AS_CXX, [AC_MSG_CHECKING([if fails if included extern "C"]) -AH_TEMPLATE([INCLUDE_MATH_H_AS_CXX], [Define if fails if included extern "C"]) +AH_TEMPLATE([INCLUDE_MATH_H_AS_CXX], [Define if fails if included extern "C".]) AC_CACHE_VAL(ac_cv_include_math_h_as_cxx, [AC_TRY_COMPILE([ extern "C" @@ -1189,7 +1189,7 @@ dnl (which is not the case on older compilers). dnl AC_CHECK_CXX_BOOL(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) AC_DEFUN(AC_CHECK_CXX_BOOL, [AC_MSG_CHECKING([if bool is built-in type]) -AH_TEMPLATE([HAVE_CXX_BOOL], [Define if bool is a built-in type]) +AH_TEMPLATE([HAVE_CXX_BOOL], [Define if bool is a built-in type.]) AC_CACHE_VAL(ac_cv_have_cxx_bool, [AC_TRY_COMPILE([],[ bool b1 = true; @@ -1229,7 +1229,7 @@ if eval "test \"`echo $ac_cv_have_cxx_volatile`\" = yes"; then changequote(, )dnl ac_tr_prototype=HAVE_CXX_VOLATILE changequote([, ])dnl - AC_DEFINE_UNQUOTED($ac_tr_prototype, ,[Define if volatile is a known keyword]) + AC_DEFINE_UNQUOTED($ac_tr_prototype, ,[Define if volatile is a known keyword.]) ifelse([$1], , :, [$1]) else AC_MSG_RESULT(no) @@ -1253,7 +1253,7 @@ ac_cv_cxx_typename, AC_LANG_RESTORE ]) if test "$ac_cv_cxx_typename" = yes; then - AC_DEFINE(HAVE_TYPENAME,,[define if the compiler recognizes typename]) + AC_DEFINE(HAVE_TYPENAME,,[Define if the compiler recognizes typename.]) fi ]) @@ -1272,7 +1272,7 @@ ac_cv_cxx_const_cast, AC_LANG_RESTORE ]) if test "$ac_cv_cxx_const_cast" = yes; then - AC_DEFINE(HAVE_CONST_CAST,,[define if the compiler supports const_cast<>]) + AC_DEFINE(HAVE_CONST_CAST,,[Define if the compiler supports const_cast<>.]) fi ]) @@ -1294,7 +1294,7 @@ Derived d; Base& b=d; return dynamic_cast(&b) ? 0 : 1;], AC_LANG_RESTORE ]) if test "$ac_cv_cxx_dynamic_cast" = yes; then - AC_DEFINE(HAVE_DYNAMIC_CAST,,[define if the compiler supports dynamic_cast<>]) + AC_DEFINE(HAVE_DYNAMIC_CAST,,[Define if the compiler supports dynamic_cast<>.]) fi ]) @@ -1319,7 +1319,7 @@ Derived d;Base& b=d;Unrelated& e=reinterpret_cast(b);return g(e);], ]) if test "$ac_cv_cxx_reinterpret_cast" = yes; then AC_DEFINE(HAVE_REINTERPRET_CAST,, - [define if the compiler supports reinterpret_cast<>]) + [Define if the compiler supports reinterpret_cast<>.]) fi ]) @@ -1343,7 +1343,7 @@ Derived d; Base& b = d; Derived& s = static_cast (b); return g (s);], ]) if test "$ac_cv_cxx_static_cast" = yes; then AC_DEFINE(HAVE_STATIC_CAST,, - [define if the compiler supports static_cast<>]) + [Define if the compiler supports static_cast<>.]) fi ]) @@ -1362,7 +1362,7 @@ ac_cv_cxx_std_nothrow, AC_LANG_RESTORE ]) if test "$ac_cv_cxx_std_nothrow" = yes; then - AC_DEFINE(HAVE_STD__NOTHROW,, [Define if the compiler supports std::nothrow]) + AC_DEFINE(HAVE_STD__NOTHROW,, [Define if the compiler supports std::nothrow.]) fi ]) @@ -1371,7 +1371,7 @@ dnl AC_CXX_NOTHROW_DELETE checks if the compiler supports non-throwing delete us dnl std::nothrow. AC_DEFUN([AC_CXX_NOTHROW_DELETE], -[AH_TEMPLATE([HAVE_NOTHROW_DELETE], [Define if the compiler supports operator delete (std::nothrow)]) +[AH_TEMPLATE([HAVE_NOTHROW_DELETE], [Define if the compiler supports operator delete (std::nothrow.)]) AC_CACHE_CHECK(whether the compiler supports operator delete (std::nothrow), ac_cv_cxx_nothrow_delete, [AC_LANG_SAVE @@ -1381,7 +1381,7 @@ ac_cv_cxx_nothrow_delete, AC_LANG_RESTORE ]) if test "$ac_cv_cxx_nothrow_delete" = yes; then - AC_DEFINE(HAVE_NOTHROW_DELETE,, [Define if the compiler supports operator delete (std::nothrow)]) + AC_DEFINE(HAVE_NOTHROW_DELETE,, [Define if the compiler supports operator delete (std::nothrow.)]) fi ]) @@ -1404,60 +1404,6 @@ if test "$ac_cv_cxx_static_assert" = yes; then fi ]) -dnl AC_LIBTIFF_LZW_COMPRESSION checks if libtiff supports LZW compression. - -AC_DEFUN([AC_LIBTIFF_LZW_COMPRESSION], -[AH_TEMPLATE([HAVE_LIBTIFF_LZW_COMPRESSION], [Define if libtiff supports LZW compression]) -AC_CACHE_CHECK(whether libtiff supports LZW compression, -ac_cv_libtiff_lzw_compression, -[AC_TRY_RUN( -changequote({{, }})dnl -{{ -extern "C" { -#include -} - -int main() -{ - const char *data[256]; - for (int j=0; j<256; ++j) data[j]= 0; - - int OK = 1; - TIFF *tif = TIFFOpen("lzwtest.tif", "w"); - if (tif) - { - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, 16); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, 16); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8); - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); - TIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB); - TIFFSetField(tif, TIFFTAG_DOCUMENTNAME, "unnamed"); - TIFFSetField(tif, TIFFTAG_IMAGEDESCRIPTION, "test"); - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1); - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 512); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - - for (unsigned long i=0; (i < 16) && OK; i++) - { - if (TIFFWriteScanline(tif, data + (i << 4), i, 0) < 0) OK = 0; - } - TIFFFlushData(tif); - TIFFClose(tif); - } - if (OK) return 0; else return 10; -} - -}} -changequote([, ])dnl - , ac_cv_libtiff_lzw_compression=yes, ac_cv_libtiff_lzw_compression=no, ac_cv_libtiff_lzw_compression=no) -]) -if test "$ac_cv_libtiff_lzw_compression" = yes; then - AC_DEFINE(HAVE_LIBTIFF_LZW_COMPRESSION,, [Define if libtiff supports LZW compression]) -fi -]) - dnl AC_CXX_LIBC_H_EXTERN_C checks if and cause a problem if dnl libc.h is included extern "C" and math.h is not. This is the case on QNX @@ -1848,6 +1794,52 @@ AS_HELP_STRING([LONGOPTION=DIR], [location of LIBNAME includes and libraries]), m4_popdef([LIBNAME])dnl ]) +dnl +dnl This macro adds the option --with-openjpeginc to configure. If this option +dnl is specified, include/ and lib/ are added to CPPFLAGS / LDFLAGS. +dnl +dnl AC_MY_OPENJPEG_PATH() +AC_DEFUN([AC_MY_OPENJPEG_PATH], +[ + AC_REQUIRE([AC_MY_LIB_PATH_RPATH])dnl + m4_pushdef([OPTION], [openjpeginc])dnl + m4_pushdef([LONGOPTION], [--with-openjpeginc])dnl + m4_pushdef([LIBNAME], [m4_default([OpenJPEG], [openjpeg])])dnl + AC_ARG_WITH([OPTION], dnl +dnl The following line is underquoted on purpose, else the help line will be +dnl discarded because it is equal to an earlier help line. +AS_HELP_STRING([LONGOPTION=DIR], [location of LIBNAME includes and libraries (MUST be specified, otherwise OpenJPEG will not be found)]), + [AS_CASE([$withval], + [yes|no], [ + AC_MSG_WARN([LONGOPTION called without argument - will use default]) + ], + [ + if test ! -d ${withval}; then + AC_MSG_ERROR([called with LONGOPTION but LIBNAME base directory ${withval} does not exist or is not a directory.]) + fi + + dnl try to find openjpeg subdirectory within given include path + OPENJPEGINCLUDEPATH=`( + eval echo "${withval}/include/openjpeg*" + )` + + dnl if not found, use include path following standard conventions + if test ! -d "${OPENJPEGINCLUDEPATH}"; then + OPENJPEGINCLUDEPATH="${withval}/include" + fi + + CPPFLAGS="-I${OPENJPEGINCLUDEPATH} $CPPFLAGS" + LDFLAGS="-L${withval}/lib $LDFLAGS" + if test "x$dcmtk_cv_rpath_works" = "xyes"; then + LDFLAGS="-Wl,-rpath,${withval}/lib $LDFLAGS" + fi + ]) + ])dnl + m4_popdef([OPTION])dnl + m4_popdef([LONGOPTION])dnl + m4_popdef([LIBNAME])dnl +]) + AC_DEFUN([AC_CHECK_SYNC_FN], [ AC_MSG_CHECKING([for $1]) @@ -1863,7 +1855,29 @@ AC_DEFUN([AC_CHECK_SYNC_FN], ) if test "$dcmtk_have_sync_fn" = yes; then AC_MSG_RESULT([yes]) - AC_DEFINE($2,[1],[Define if $1 is available]) + AC_DEFINE($2,[1],[Define if $1 is available.]) + else + AC_MSG_RESULT([no]) + fi +]) + +AC_DEFUN([AC_CHECK_ITERATOR_CATEGORY], +[ + AC_MSG_CHECKING([whether iterator category $1 is declared]) + AC_COMPILE_IFELSE( + [ + AC_LANG_SOURCE( + [ + #include + int main(){typedef std::$1_iterator_tag category;return 0;} + ]) + ], + [dcmtk_have_iter_cat=[yes]], + [dcmtk_have_iter_cat=[no]] + ) + if test "$dcmtk_have_iter_cat" = yes; then + AC_MSG_RESULT([yes]) + AC_DEFINE($2,[1],[Define if the $1 iterator category is supported.]) else AC_MSG_RESULT([no]) fi @@ -1884,7 +1898,7 @@ AC_DEFUN([AC_CHECK_ALIGNOF], ) if test "$dcmtk_have_alignof" = yes; then AC_MSG_RESULT([yes]) - AC_DEFINE($1,[1],[Define if __alignof__ is available]) + AC_DEFINE($1,[1],[Define if __alignof__ is available.]) else AC_MSG_RESULT([no]) fi @@ -1905,7 +1919,7 @@ AC_DEFUN([AC_CHECK_ATTRIBUTE_ALIGNED], ) if test "$dcmtk_have_attribute_aligned" = yes; then AC_MSG_RESULT([yes]) - AC_DEFINE($1,[1],[Define if __attribute__((aligned)) is available]) + AC_DEFINE($1,[1],[Define if __attribute__((aligned)) is available.]) else AC_MSG_RESULT([no]) fi @@ -1932,7 +1946,7 @@ AC_DEFUN([AC_CHECK_ATTRIBUTE_ALIGNED_SUPPORTS_TEMPLATES], ) if test "$dcmtk_attribute_aligned_supports_templates" = yes; then AC_MSG_RESULT([yes]) - AC_DEFINE($1,[1],[Define if __attribute__((aligned)) supports templates]) + AC_DEFINE($1,[1],[Define if __attribute__((aligned)) supports templates.]) else AC_MSG_RESULT([no]) fi @@ -1965,7 +1979,7 @@ AC_DEFUN([AC_CHECK_DEFAULT_CONSTRUCTOR_DETECTION_VIA_SFINAE], ) if test "$dcmtk_default_constructor_detection_via_sfinae" = yes; then AC_MSG_RESULT([yes]) - AC_DEFINE($1,[1],[Define if the compiler supports default constructor detection via SFINAE]) + AC_DEFINE($1,[1],[Define if the compiler supports default constructor detection via SFINAE.]) else AC_MSG_RESULT([no]) fi diff --git a/config/configure b/config/configure index 319aee01..4c04502f 100755 --- a/config/configure +++ b/config/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dcmtk 3.6.4. +# Generated by GNU Autoconf 2.69 for dcmtk 3.6.5. # # Report bugs to . # @@ -579,9 +579,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dcmtk' -PACKAGE_TARNAME='dcmtk-3.6.4' -PACKAGE_VERSION='3.6.4' -PACKAGE_STRING='dcmtk 3.6.4' +PACKAGE_TARNAME='dcmtk-3.6.5' +PACKAGE_VERSION='3.6.5' +PACKAGE_STRING='dcmtk 3.6.5' PACKAGE_BUGREPORT='bugs@dcmtk.org' PACKAGE_URL='http://www.dcmtk.org/' @@ -625,6 +625,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS DEBUG +OPENJPEGLIBS ICONVLIBS SNDFILELIBS TCPWRAPPERLIBS @@ -737,6 +738,7 @@ with_libxmlinc with_libxml with_libwrapinc with_libwrap +with_openjpeginc with_libsndfileinc with_libsndfile with_libiconvinc @@ -1311,7 +1313,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dcmtk 3.6.4 to adapt to many kinds of systems. +\`configure' configures dcmtk 3.6.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1376,7 +1378,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dcmtk 3.6.4:";; + short | recursive ) echo "Configuration of dcmtk 3.6.5:";; esac cat <<\_ACEOF @@ -1454,6 +1456,10 @@ Optional Packages: --with-libwrapinc=DIR location of libwrap includes and libraries --with-libwrap include libwrap support (default: auto) --without-libwrap don't include libwrap support + --with-openjpeginc=DIR location of OpenJPEG includes and libraries (MUST be + specified, otherwise OpenJPEG will not be found) + --with-openjpeg include OpenJPEG support (default: auto) + --without-openjpeg don't include OpenJPEG support --with-libsndfileinc=DIR location of libsndfile includes and libraries --with-libsndfile include libsndfile support (default: auto) @@ -1545,7 +1551,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dcmtk configure 3.6.4 +dcmtk configure 3.6.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2405,7 +2411,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dcmtk $as_me 3.6.4, which was +It was created by dcmtk $as_me 3.6.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2827,10 +2833,9 @@ ac_config_headers="$ac_config_headers include/dcmtk/config/osconfig.h" -PACKAGE_VERSION_NUMBER=364 +PACKAGE_VERSION_NUMBER=365 PACKAGE_VERSION_SUFFIX="" -PACKAGE_DATE="2018-11-29" - +PACKAGE_DATE="2019-10-28" cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_NUMBER ${PACKAGE_VERSION_NUMBER} @@ -5772,6 +5777,17 @@ _ACEOF fi +ac_fn_c_check_type "$LINENO" "char16_t" "ac_cv_type_char16_t" "$ac_includes_default" +if test "x$ac_cv_type_char16_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_CHAR16_T 1 +_ACEOF + + +fi + + ac_fn_c_check_type "$LINENO" "sigjmp_buf" "ac_cv_type_sigjmp_buf" "#include " if test "x$ac_cv_type_sigjmp_buf" = xyes; then : @@ -5975,7 +5991,7 @@ _ACEOF fi done -for ac_func in strchr strstr strtoul itoa +for ac_func in strchr strstr strtoul itoa atoll do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -6128,6 +6144,28 @@ _ACEOF fi done +for ac_func in getrusage +do : + ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage" +if test "x$ac_cv_func_getrusage" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETRUSAGE 1 +_ACEOF + +fi +done + +for ac_func in gettimeofday +do : + ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETTIMEOFDAY 1 +_ACEOF + +fi +done + for ac_func in waitpid do : ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid" @@ -7133,6 +7171,7 @@ fi fi OPENSSLLIBS="" +OPENJPEGLIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 $as_echo_n "checking for main in -ldl... " >&6; } if ${ac_cv_lib_dl_main+:} false; then : @@ -7166,6 +7205,7 @@ $as_echo "$ac_cv_lib_dl_main" >&6; } if test "x$ac_cv_lib_dl_main" = xyes; then : OPENSSLLIBS="-ldl" +OPENJPEGLIBS="-ldl" fi @@ -7209,6 +7249,7 @@ $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : OPENSSLLIBS="-ldl" +OPENJPEGLIBS="-ldl" fi @@ -8747,6 +8788,16 @@ fi done +ac_fn_cxx_check_header_mongrel "$LINENO" "iterator" "ac_cv_header_iterator" "$ac_includes_default" +if test "x$ac_cv_header_iterator" = xyes; then : + +$as_echo "#define HAVE_ITERATOR_HEADER 1" >>confdefs.h + + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable poll.h" >&5 $as_echo_n "checking for usable poll.h... " >&6; } @@ -13010,7 +13061,7 @@ if ${ac_cv_check_std_namespace+:} false; then : else ac_link_o='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5' cat > conftest.$ac_ext < @@ -13482,7 +13533,7 @@ if ${ac_cv_check_class_template+:} false; then : else ac_link_o='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5' cat > conftest.$ac_ext < @@ -13554,7 +13605,7 @@ if ${ac_cv_check_static_template_method+:} false; then : else ac_link_o='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5' cat > conftest.$ac_ext < conftest.$ac_ext < @@ -14440,79 +14491,6 @@ $as_echo "yes" >&6; } $as_echo "#define WITH_LIBTIFF /**/" >>confdefs.h TIFFLIBS="-ltiff $JPEGLIBS $ZLIBLIBS" - SAVELIBS="$LIBS" - LIBS="$LIBS -ltiff $JPEGLIBS $ZLIBLIBS" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libtiff supports LZW compression" >&5 -$as_echo_n "checking whether libtiff supports LZW compression... " >&6; } -if ${ac_cv_libtiff_lzw_compression+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_libtiff_lzw_compression=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -extern "C" { -#include -} - -int main() -{ - const char *data[256]; - for (int j=0; j<256; ++j) data[j]= 0; - - int OK = 1; - TIFF *tif = TIFFOpen("lzwtest.tif", "w"); - if (tif) - { - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, 16); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, 16); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8); - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); - TIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB); - TIFFSetField(tif, TIFFTAG_DOCUMENTNAME, "unnamed"); - TIFFSetField(tif, TIFFTAG_IMAGEDESCRIPTION, "test"); - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1); - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 512); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - - for (unsigned long i=0; (i < 16) && OK; i++) - { - if (TIFFWriteScanline(tif, data + (i << 4), i, 0) < 0) OK = 0; - } - TIFFFlushData(tif); - TIFFClose(tif); - } - if (OK) return 0; else return 10; -} - - - -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - ac_cv_libtiff_lzw_compression=yes -else - ac_cv_libtiff_lzw_compression=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libtiff_lzw_compression" >&5 -$as_echo "$ac_cv_libtiff_lzw_compression" >&6; } -if test "$ac_cv_libtiff_lzw_compression" = yes; then - -$as_echo "#define HAVE_LIBTIFF_LZW_COMPRESSION /**/" >>confdefs.h - -fi - - LIBS="$SAVELIBS" ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -14541,76 +14519,6 @@ $as_echo "#define WITH_LIBTIFF /**/" >>confdefs.h TIFFLIBS="-ltiff $JPEGLIBS $ZLIBLIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libtiff supports LZW compression" >&5 -$as_echo_n "checking whether libtiff supports LZW compression... " >&6; } -if ${ac_cv_libtiff_lzw_compression+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_libtiff_lzw_compression=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -extern "C" { -#include -} - -int main() -{ - const char *data[256]; - for (int j=0; j<256; ++j) data[j]= 0; - - int OK = 1; - TIFF *tif = TIFFOpen("lzwtest.tif", "w"); - if (tif) - { - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, 16); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, 16); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8); - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); - TIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB); - TIFFSetField(tif, TIFFTAG_DOCUMENTNAME, "unnamed"); - TIFFSetField(tif, TIFFTAG_IMAGEDESCRIPTION, "test"); - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1); - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 512); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - - for (unsigned long i=0; (i < 16) && OK; i++) - { - if (TIFFWriteScanline(tif, data + (i << 4), i, 0) < 0) OK = 0; - } - TIFFFlushData(tif); - TIFFClose(tif); - } - if (OK) return 0; else return 10; -} - - - -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - ac_cv_libtiff_lzw_compression=yes -else - ac_cv_libtiff_lzw_compression=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libtiff_lzw_compression" >&5 -$as_echo "$ac_cv_libtiff_lzw_compression" >&6; } -if test "$ac_cv_libtiff_lzw_compression" = yes; then - -$as_echo "#define HAVE_LIBTIFF_LZW_COMPRESSION /**/" >>confdefs.h - -fi - - else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14916,6 +14824,93 @@ fi +# Check whether --with-openjpeginc was given. +if test "${with_openjpeginc+set}" = set; then : + withval=$with_openjpeginc; case $withval in #( + yes|no) : + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-openjpeginc called without argument - will use default" >&5 +$as_echo "$as_me: WARNING: --with-openjpeginc called without argument - will use default" >&2;} + ;; #( + *) : + + if test ! -d ${withval}; then + as_fn_error $? "called with --with-openjpeginc but OpenJPEG base directory ${withval} does not exist or is not a directory." "$LINENO" 5 + fi + + OPENJPEGINCLUDEPATH=`( + eval echo "${withval}/include/openjpeg*" + )` + + if test ! -d "${OPENJPEGINCLUDEPATH}"; then + OPENJPEGINCLUDEPATH="${withval}/include" + fi + + CPPFLAGS="-I${OPENJPEGINCLUDEPATH} $CPPFLAGS" + LDFLAGS="-L${withval}/lib $LDFLAGS" + if test "x$dcmtk_cv_rpath_works" = "xyes"; then + LDFLAGS="-Wl,-rpath,${withval}/lib $LDFLAGS" + fi + ;; +esac + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include OpenJPEG support" >&5 +$as_echo_n "checking whether to include OpenJPEG support... " >&6; } + +# Check whether --with-libwrap was given. +if test "${with_libwrap+set}" = set; then : + withval=$with_libwrap; case "$withval" in + yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define WITH_OPENJPEG /**/" >>confdefs.h + + OPENJPEGLIBS="-lopenjp2 $OPENJPEGLIBS" + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +else + SAVELIBS="$LIBS" + LIBS="-lopenjp2 $OPENJPEGLIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +(void) opj_version() + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define WITH_OPENJPEG /**/" >>confdefs.h + + OPENJPEGLIBS="-lopenjp2 $OPENJPEGLIBS" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$SAVELIBS" +fi + + + + + + # Check whether --with-libsndfileinc was given. if test "${with_libsndfileinc+set}" = set; then : withval=$with_libsndfileinc; case $withval in #( @@ -16924,6 +16919,190 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iterator category input is declared" >&5 +$as_echo_n "checking whether iterator category input is declared... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + int main(){typedef std::input_iterator_tag category;return 0;} + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + dcmtk_have_iter_cat=yes +else + dcmtk_have_iter_cat=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$dcmtk_have_iter_cat" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_INPUT_ITERATOR_CATEGORY 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iterator category output is declared" >&5 +$as_echo_n "checking whether iterator category output is declared... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + int main(){typedef std::output_iterator_tag category;return 0;} + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + dcmtk_have_iter_cat=yes +else + dcmtk_have_iter_cat=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$dcmtk_have_iter_cat" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_OUTPUT_ITERATOR_CATEGORY 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iterator category forward is declared" >&5 +$as_echo_n "checking whether iterator category forward is declared... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + int main(){typedef std::forward_iterator_tag category;return 0;} + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + dcmtk_have_iter_cat=yes +else + dcmtk_have_iter_cat=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$dcmtk_have_iter_cat" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_FORWARD_ITERATOR_CATEGORY 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iterator category bidirectional is declared" >&5 +$as_echo_n "checking whether iterator category bidirectional is declared... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + int main(){typedef std::bidirectional_iterator_tag category;return 0;} + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + dcmtk_have_iter_cat=yes +else + dcmtk_have_iter_cat=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$dcmtk_have_iter_cat" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_BIDIRECTIONAL_ITERATOR_CATEGORY 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iterator category random_access is declared" >&5 +$as_echo_n "checking whether iterator category random_access is declared... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + int main(){typedef std::random_access_iterator_tag category;return 0;} + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + dcmtk_have_iter_cat=yes +else + dcmtk_have_iter_cat=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$dcmtk_have_iter_cat" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_RANDOM_ACCESS_ITERATOR_CATEGORY 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iterator category contiguous is declared" >&5 +$as_echo_n "checking whether iterator category contiguous is declared... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + int main(){typedef std::contiguous_iterator_tag category;return 0;} + + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + dcmtk_have_iter_cat=yes +else + dcmtk_have_iter_cat=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$dcmtk_have_iter_cat" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_CONTIGUOUS_ITERATOR_CATEGORY 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + + CFLAGS="$DEBUGCFLAGS $CFLAGS" CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS" @@ -16939,6 +17118,7 @@ CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS" + ac_config_files="$ac_config_files Makefile.def Makefile" cat >confcache <<\_ACEOF @@ -17447,7 +17627,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dcmtk $as_me 3.6.4, which was +This file was extended by dcmtk $as_me 3.6.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17510,7 +17690,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dcmtk config.status 3.6.4 +dcmtk config.status 3.6.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/config/configure.in b/config/configure.in index 6f58c478..3c84bc53 100644 --- a/config/configure.in +++ b/config/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(dcmtk, 3.6.4, [bugs@dcmtk.org], [dcmtk-3.6.4], [http://www.dcmtk.org/]) +AC_INIT(dcmtk, 3.6.5, [bugs@dcmtk.org], [dcmtk-3.6.5], [http://www.dcmtk.org/]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_HEADERS(include/dcmtk/config/osconfig.h) @@ -10,10 +10,9 @@ dnl ------------------------------------------------------- dnl Additional Package Information dnl ------------------------------------------------------- -PACKAGE_VERSION_NUMBER=364 +PACKAGE_VERSION_NUMBER=365 PACKAGE_VERSION_SUFFIX="" -PACKAGE_DATE="2018-11-29" - +PACKAGE_DATE="2019-10-28" AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER,${PACKAGE_VERSION_NUMBER},[Define to the version number of this package.]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_SUFFIX,"${PACKAGE_VERSION_SUFFIX}",[Define to the version suffix of this package.]) AC_DEFINE_UNQUOTED(PACKAGE_DATE,"${PACKAGE_DATE}",[Define to the release date of this package.]) @@ -233,6 +232,8 @@ AC_CHECK_HEADERS(cstdint) AC_CHECK_TYPES(int64_t) AC_CHECK_TYPES(uint64_t) +AC_CHECK_TYPES(char16_t) + AC_CHECK_TYPES([sigjmp_buf], [], [], [[#include ]]) dnl ------------------------------------------------------- @@ -244,7 +245,7 @@ AC_FUNC_VPRINTF AC_TYPE_SIGNAL AC_FUNC_WAIT3 AC_CHECK_FUNCS(gethostname gethostid socket sysinfo) -AC_CHECK_FUNCS(strchr strstr strtoul itoa) +AC_CHECK_FUNCS(strchr strstr strtoul itoa atoll) AC_CHECK_FUNCS(memcpy memset memmove memcmp bcopy bcmp) AC_CHECK_FUNCS(getpid mktemp tempnam tmpnam getenv mkstemp) AC_CHECK_FUNCS(stat) @@ -257,6 +258,8 @@ AC_CHECK_FUNCS(listen connect setsockopt getsockopt select) AC_CHECK_FUNCS(gethostbyname gethostbyname_r) AC_CHECK_FUNCS(gethostbyaddr_r getgrnam_r getpwnam_r) AC_CHECK_FUNCS(bind accept getsockname getaddrinfo) +AC_CHECK_FUNCS(getrusage) +AC_CHECK_FUNCS(gettimeofday) AC_CHECK_FUNCS(waitpid) AC_CHECK_FUNCS(getuid geteuid setuid getpwnam getgrnam) AC_CHECK_FUNCS(sleep fork) @@ -432,15 +435,17 @@ fi dnl Some newer versions of OpenSSL must be linked against libdl. dnl We just check whether libdl exists and in this case always -dnl add -ldl to OPENSSLLIBS. -dnl +dnl add -ldl to OPENSSLLIBS. The same applies for OPENJPEG. OPENSSLLIBS="" +OPENJPEGLIBS="" AC_CHECK_LIB(dl, main,[ OPENSSLLIBS="-ldl" +OPENJPEGLIBS="-ldl" ]) if test $ac_cv_lib_dl_main = no ; then AC_CHECK_LIB(dl, dlopen,[ OPENSSLLIBS="-ldl" +OPENJPEGLIBS="-ldl" ]) fi @@ -547,6 +552,10 @@ AC_CHECK_HEADERS(utime.h) AC_CHECK_HEADERS(wchar.h) AC_CHECK_HEADERS(wctype.h) AC_CHECK_HEADERS(fenv.h) +AC_CHECK_HEADER(iterator, + [AC_DEFINE([HAVE_ITERATOR_HEADER], 1, [Define to 1 if you have the header file.])] +) + AC_CHECK_POLL_H if test $ac_cv_header_libc_h = yes ; then @@ -1082,10 +1091,6 @@ AS_HELP_STRING([--without-libtiff], [don't include libtiff support])], AC_MSG_RESULT(yes) AC_DEFINE(WITH_LIBTIFF, , [Define if we are compiling with libtiff support.]) TIFFLIBS="-ltiff $JPEGLIBS $ZLIBLIBS" - SAVELIBS="$LIBS" - LIBS="$LIBS -ltiff $JPEGLIBS $ZLIBLIBS" - AC_LIBTIFF_LZW_COMPRESSION - LIBS="$SAVELIBS" ;; *) AC_MSG_RESULT(no) @@ -1097,7 +1102,6 @@ AS_HELP_STRING([--without-libtiff], [don't include libtiff support])], [ AC_MSG_RESULT(yes) AC_DEFINE(WITH_LIBTIFF, , [Define if we are compiling with libtiff support.]) TIFFLIBS="-ltiff $JPEGLIBS $ZLIBLIBS" - AC_LIBTIFF_LZW_COMPRESSION ], [AC_MSG_RESULT(no)]) LIBS="$SAVELIBS"] ) @@ -1236,6 +1240,36 @@ AS_HELP_STRING([--without-libwrap], [don't include libwrap support])], LIBS="$SAVELIBS"] ) +dnl ------------------------------------------------------- +dnl Check for OpenJPEG support +dnl ------------------------------------------------------- + +AC_MY_OPENJPEG_PATH() + +AC_MSG_CHECKING(whether to include OpenJPEG support) +AC_ARG_WITH(libwrap, +[AS_HELP_STRING([--with-openjpeg], [include OpenJPEG support (default: auto)]) +AS_HELP_STRING([--without-openjpeg], [don't include OpenJPEG support])], +[ case "$withval" in + yes) + AC_MSG_RESULT(yes) + AC_DEFINE(WITH_OPENJPEG, , [Define if we are compiling with OpenJPEG support.]) + OPENJPEGLIBS="-lopenjp2 $OPENJPEGLIBS" + ;; + *) + AC_MSG_RESULT(no) + ;; + esac ], +[ SAVELIBS="$LIBS" + LIBS="-lopenjp2 $OPENJPEGLIBS $LIBS" + AC_TRY_LINK([#include ], [(void) opj_version()], + [ AC_MSG_RESULT(yes) + AC_DEFINE(WITH_OPENJPEG, , [Define if we are compiling with OpenJPEG support.]) + OPENJPEGLIBS="-lopenjp2 $OPENJPEGLIBS" ], + [AC_MSG_RESULT(no)]) + LIBS="$SAVELIBS"] ) + + dnl ------------------------------------------------------- dnl Check for libsndfile support dnl ------------------------------------------------------- @@ -1816,6 +1850,19 @@ AC_TRY_COMPILE([#include ], AC_DEFINE(HAVE_SYS_GETTID, , [Define if your system has a prototype for gettid.]) ], [AC_MSG_RESULT(no)]) + +dnl ------------------------------------------------------- +dnl Test for defined iterator categories +dnl ------------------------------------------------------- + +AC_CHECK_ITERATOR_CATEGORY([input],[HAVE_INPUT_ITERATOR_CATEGORY]) +AC_CHECK_ITERATOR_CATEGORY([output],[HAVE_OUTPUT_ITERATOR_CATEGORY]) +AC_CHECK_ITERATOR_CATEGORY([forward],[HAVE_FORWARD_ITERATOR_CATEGORY]) +AC_CHECK_ITERATOR_CATEGORY([bidirectional],[HAVE_BIDIRECTIONAL_ITERATOR_CATEGORY]) +AC_CHECK_ITERATOR_CATEGORY([random_access],[HAVE_RANDOM_ACCESS_ITERATOR_CATEGORY]) +AC_CHECK_ITERATOR_CATEGORY([contiguous],[HAVE_CONTIGUOUS_ITERATOR_CATEGORY]) + + dnl ------------------------------------------------------- dnl Set optimizer and debug compiler flags dnl ------------------------------------------------------- @@ -1835,6 +1882,7 @@ AC_SUBST(XMLLIBS) AC_SUBST(TCPWRAPPERLIBS) AC_SUBST(SNDFILELIBS) AC_SUBST(ICONVLIBS) +AC_SUBST(OPENJPEGLIBS) AC_SUBST(DEBUG) AC_OUTPUT(Makefile.def Makefile) diff --git a/config/docs/macros.txt b/config/docs/macros.txt index 912c30b1..86c49193 100644 --- a/config/docs/macros.txt +++ b/config/docs/macros.txt @@ -73,6 +73,19 @@ DCMTK_GUI either present them to the user or store them in a log file. See comments in ofstd/include/dcmtk/ofstd/ofconsol.h. +DCMTK_LOG4CPLUS_AVOID_WIN32_FLS + Affected: oflog + Type of modification: Disables feature + Explanation: Starting with release 3.6.5, DCMTK uses fiber local storage + instead of thread local storage in the oflog module on Windows to store + thread-specific information. This has the advantage that a callback can + be (and is) registered that automatically cleans up the memory when a + thread ends. The old behaviour can be re-activated with this macro. + This may be necessary when an application wants to use multiple fibers + within a single thread. In that case, before ending a thread, + dcmtk::log4cplus::threadCleanup() should be called by the user code in + order to clean-up oflog's thread local storage. + DICOMDIR_WITHOUT_BACKUP Affected: dcmdata Type of modification: Disables feature @@ -87,13 +100,15 @@ DISABLE_COMPRESSION_EXTENSION syntaxes) in dcmqrdb, a feature which is still experimental. DISABLE_FF_JPEG_BITSTREAM_PADDING - Affected: dcmjpeg, dcmjpls + Affected: dcmjpeg, dcmjpls (dcmjpls only up to DCMTK 3.6.4) Type of modification: Disables feature Explanation: Starting with release 3.6.2, DCMTK pads JPEG and JPEG-LS bitstreams that have odd length with an "extended" end of image (EOI) marker, writing ff/ff/d9 instead of adding a zero byte after the EOI marker, i.e. writing ff/d9/00. The old behaviour can be restored by defining this macro. + In the dcmjpls module, the macro has been replaced by a codec + parameter that can be set at runtime starting with DCMTK 3.6.5. DISABLE_NAGLE_ALGORITHM Affected: dcmnet @@ -362,8 +377,8 @@ USE_WIN32_CREATE_MUTEX Type of modification: Activates alternative implementation Explanation: Starting with DCMTK 3.6.2, the Win32 version of the OFMutex class uses critical sections instead of Win32 mutexes, because - critical sections are much faster. Their only drawback is that they - cannot be shared across processes. Users who want to revert to the + critical sections are much faster. Their only drawback is that they + cannot be shared across processes. Users who want to revert to the behavior of older DCMTK releases can define this macro. USE_WIN32_READ_WRITE_LOCK_HELPER @@ -373,7 +388,7 @@ USE_WIN32_READ_WRITE_LOCK_HELPER OFReadWriteLock class uses Slim Reader/Writer (SRW) Locks, which are available since Windows Vista, instead of the older implementation based on a Mutex, a Semaphore and a counter, because - SRW locks are much faster. Users who want to revert to the + SRW locks are much faster. Users who want to revert to the behavior of older DCMTK releases can define this macro. USING_STD_NAMESPACE @@ -406,6 +421,17 @@ WIDE_CHAR_MAIN_FUNCTION this macro by setting the CMake option DCMTK_WIDE_CHAR_MAIN_FUNCTION to "on". Usually, WIDE_CHAR_FILE_IO_FUNCTIONS should also be enabled. +WIDE_CHAR_XML_PARSER + Affected: ofstd + Type of modification: Activates experimental or rarely used feature + Explanation: The XML parser that is part of the DCMTK also supports a wide + character API, at least on Windows systems. By defining this macro, the + type "wchar_t" is used for character strings instead of "char". Please + note, however, that some DCMTK tools and classes have not yet been adapted + for the wide character API of the parser, e.g. cda2dcm and the underlying + class DcmEncapsulatedDocument. This is also the reason why there is no + CMake option yet. + WRITE_VERY_LARGE_CHUNKS Affected: dcmdata Type of modification: Re-activated behavior of earlier DCMTK releases diff --git a/config/include/dcmtk/config/osconfig.h.in b/config/include/dcmtk/config/osconfig.h.in index 566fd5cc..006750e1 100644 --- a/config/include/dcmtk/config/osconfig.h.in +++ b/config/include/dcmtk/config/osconfig.h.in @@ -23,13 +23,13 @@ #define ENVIRONMENT_PATH_SEPARATOR ';' #endif -/* Define if __attribute__((aligned)) supports templates */ +/* Define if __attribute__((aligned)) supports templates. */ #undef ATTRIBUTE_ALIGNED_SUPPORTS_TEMPLATES /* Define the canonical host system type as a string constant. */ #undef CANONICAL_HOST_TYPE -/* Define if char is unsigned on the C compiler */ +/* Define if char is unsigned on the C compiler. */ #undef C_CHAR_UNSIGNED /* Define to the inline keyword supported by the C compiler, if any, or to the @@ -57,7 +57,7 @@ /* Try to define the iconv behavior as conversion flags */ #undef DCMTK_FIXED_ICONV_CONVERSION_FLAGS -/* Define if your system has a usable */ +/* Define if your system has a usable . */ #undef DCMTK_HAVE_POLL /* Define the DCMTK default path. */ @@ -106,7 +106,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ASSERT_H -/* Define if __attribute__((aligned)) is available */ +/* Define to 1 if you have the `atoll' function. */ +#undef HAVE_ATOLL + +/* Define if __attribute__((aligned)) is available. */ #undef HAVE_ATTRIBUTE_ALIGNED /* Define to 1 if you have the `bcmp' function. */ @@ -115,17 +118,23 @@ /* Define to 1 if you have the `bcopy' function. */ #undef HAVE_BCOPY +/* Define if the bidirectional iterator category is supported. */ +#undef HAVE_BIDIRECTIONAL_ITERATOR_CATEGORY + /* Define to 1 if you have the `bind' function. */ #undef HAVE_BIND /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO +/* Define to 1 if the system has the type `char16_t'. */ +#undef HAVE_CHAR16_T + /* Define if your system declares the return type of strerror_r as char * instead of int */ #undef HAVE_CHARP_STRERROR_R -/* Define if your C++ compiler can work with class templates */ +/* Define if your C++ compiler can work with class templates. */ #undef HAVE_CLASS_TEMPLATE /* Define to 1 if you have the header file. */ @@ -137,9 +146,12 @@ /* Define to 1 if you have the `connect' function. */ #undef HAVE_CONNECT -/* define if the compiler supports const_cast<> */ +/* Define if the compiler supports const_cast<>. */ #undef HAVE_CONST_CAST +/* Define if the contiguous iterator category is supported. */ +#undef HAVE_CONTIGUOUS_ITERATOR_CATEGORY + /* Define to 1 if you have the header file. */ #undef HAVE_CSTDARG @@ -161,28 +173,29 @@ /* define if the compiler supports basic C++11 syntax */ #undef HAVE_CXX11 -/* Define if bool is a built-in type */ +/* Define if bool is a built-in type. */ #undef HAVE_CXX_BOOL /* Define if volatile is a known keyword */ #undef HAVE_CXX_VOLATILE -/* Define if "const" is supported by the C compiler */ +/* Define if "const" is supported by the C compiler. */ #undef HAVE_C_CONST /* Define if your system has a declaration for socklen_t in sys/types.h - sys/socket.h */ + sys/socket.h . */ #undef HAVE_DECLARATION_SOCKLEN_T /* Define if your system has a declaration for std::ios_base::openmode in - iostream.h */ + iostream.h. */ #undef HAVE_DECLARATION_STD__IOS_BASE__OPENMODE /* Define if your system has a declaration for struct utimbuf in sys/types.h - utime.h sys/utime.h */ + utime.h sys/utime.h . */ #undef HAVE_DECLARATION_STRUCT_UTIMBUF -/* Define if the compiler supports default constructor detection via SFINAE */ +/* Define if the compiler supports default constructor detection via SFINAE. + */ #undef HAVE_DEFAULT_CONSTRUCTOR_DETECTION_VIA_SFINAE /* Define to 1 if you have the header file, and it defines `DIR'. @@ -192,7 +205,7 @@ /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ #undef HAVE_DOPRNT -/* define if the compiler supports dynamic_cast<> */ +/* Define if the compiler supports dynamic_cast<>. */ #undef HAVE_DYNAMIC_CAST /* Define if your system cannot pass command line arguments into main() (e.g. Macintosh). */ @@ -205,7 +218,7 @@ #undef HAVE_ERRNO_H /* Define if your C++ compiler supports the explicit template specialization - syntax */ + syntax. */ #undef HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION /* Define to 1 if you have the `fcntl' function. */ @@ -232,6 +245,9 @@ /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK +/* Define if the forward iterator category is supported. */ +#undef HAVE_FORWARD_ITERATOR_CATEGORY + /* Define to 1 if the system has the type `fpos64_t'. */ #undef HAVE_FPOS64_T @@ -247,7 +263,7 @@ /* Define to 1 if you have the `ftime' function. */ #undef HAVE_FTIME -/* Define if your C++ compiler can work with function templates */ +/* Define if your C++ compiler can work with function templates. */ #undef HAVE_FUNCTION_TEMPLATE /* Define to 1 if you have the `getaddrinfo' function. */ @@ -295,19 +311,25 @@ /* Define to 1 if you have the `getpwnam_r' function. */ #undef HAVE_GETPWNAM_R +/* Define to 1 if you have the `getrusage' function. */ +#undef HAVE_GETRUSAGE + /* Define to 1 if you have the `getsockname' function. */ #undef HAVE_GETSOCKNAME /* Define to 1 if you have the `getsockopt' function. */ #undef HAVE_GETSOCKOPT +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID /* Define to 1 if you have the `gmtime_r' function. */ #undef HAVE_GMTIME_R -/* Define if __alignof__ is available */ +/* Define if __alignof__ is available. */ #undef HAVE_GNU_ALIGNOF /* Define to 1 if you have the header file. */ @@ -325,19 +347,22 @@ /* Define to 1 if you have the `index' function. */ #undef HAVE_INDEX +/* Define if the input iterator category is supported. */ +#undef HAVE_INPUT_ITERATOR_CATEGORY + /* Define to 1 if the system has the type `int64_t'. */ #undef HAVE_INT64_T /* Define if your system declares argument 3 of accept() as int * instead of - size_t * or socklen_t * */ + size_t * or socklen_t *. */ #undef HAVE_INTP_ACCEPT /* Define if your system declares argument 5 of getsockopt() as int * instead - of size_t * or socklen_t */ + of size_t * or socklen_t. */ #undef HAVE_INTP_GETSOCKOPT /* Define if your system declares argument 2-4 of select() as int * instead of - struct fd_set * */ + struct fd_set *. */ #undef HAVE_INTP_SELECT /* Define to 1 if you have the header file. */ @@ -370,6 +395,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ISO646_H +/* Define to 1 if you have the header file. */ +#undef HAVE_ITERATOR_HEADER + /* Define to 1 if you have the `itoa' function. */ #undef HAVE_ITOA @@ -388,9 +416,6 @@ /* Define to 1 if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET -/* Define if libtiff supports LZW compression */ -#undef HAVE_LIBTIFF_LZW_COMPRESSION - /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -475,7 +500,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NEW_H -/* Define if the compiler supports operator delete (std::nothrow) */ +/* Define if the compiler supports operator delete (std::nothrow.) */ #undef HAVE_NOTHROW_DELETE /* Define `pid_t' to `int' if does not define. */ @@ -541,6 +566,9 @@ typedef unsigned short ushort; arguments. */ #undef HAVE_OLD_READDIR_R +/* Define if the output iterator category is supported. */ +#undef HAVE_OUTPUT_ITERATOR_CATEGORY + /* Define if passwd::pw_gecos is available. */ #undef HAVE_PASSWD_GECOS @@ -554,134 +582,134 @@ typedef unsigned short ushort; #undef HAVE_POPEN /* Define if your system has a prototype for accept in sys/types.h - sys/socket.h */ + sys/socket.h. */ #undef HAVE_PROTOTYPE_ACCEPT -/* Define if your system has a prototype for bind in sys/types.h sys/socket.h +/* Define if your system has a prototype for bind in sys/types.h sys/socket.h. */ #undef HAVE_PROTOTYPE_BIND /* Define if your system has a prototype for bzero in string.h strings.h - libc.h unistd.h stdlib.h */ + libc.h unistd.h stdlib.h. */ #undef HAVE_PROTOTYPE_BZERO /* Define if your system has a prototype for connect in sys/types.h - sys/socket.h */ + sys/socket.h. */ #undef HAVE_PROTOTYPE_CONNECT -/* Define if your system has a prototype for feenableexcept in fenv.h */ +/* Define if your system has a prototype for feenableexcept in fenv.h. */ #undef HAVE_PROTOTYPE_FEENABLEEXCEPT -/* Define if your system has a prototype for finite in math.h */ +/* Define if your system has a prototype for finite in math.h. */ #undef HAVE_PROTOTYPE_FINITE -/* Define if your system has a prototype for flock in sys/file.h */ +/* Define if your system has a prototype for flock in sys/file.h. */ #undef HAVE_PROTOTYPE_FLOCK /* Define if your system has a prototype for gethostbyaddr_r in libc.h - unistd.h stdlib.h netdb.h */ + unistd.h stdlib.h netdb.h. */ #undef HAVE_PROTOTYPE_GETHOSTBYADDR_R /* Define if your system has a prototype for gethostbyname in libc.h unistd.h - stdlib.h netdb.h */ + stdlib.h netdb.h. */ #undef HAVE_PROTOTYPE_GETHOSTBYNAME /* Define if your system has a prototype for gethostbyname_r in libc.h - unistd.h stdlib.h netdb.h */ + unistd.h stdlib.h netdb.h. */ #undef HAVE_PROTOTYPE_GETHOSTBYNAME_R /* Define if your system has a prototype for gethostid in libc.h unistd.h - stdlib.h netdb.h */ + stdlib.h netdb.h. */ #undef HAVE_PROTOTYPE_GETHOSTID /* Define if your system has a prototype for gethostname in unistd.h libc.h - stdlib.h netdb.h */ + stdlib.h netdb.h. */ #undef HAVE_PROTOTYPE_GETHOSTNAME /* Define if your system has a prototype for getsockname in sys/types.h - sys/socket.h */ + sys/socket.h. */ #undef HAVE_PROTOTYPE_GETSOCKNAME /* Define if your system has a prototype for getsockopt in sys/types.h - sys/socket.h */ + sys/socket.h. */ #undef HAVE_PROTOTYPE_GETSOCKOPT /* Define if your system has a prototype for gettimeofday in sys/time.h - unistd.h */ + unistd.h. */ #undef HAVE_PROTOTYPE_GETTIMEOFDAY -/* Define if your system has a prototype for isinf in math.h */ +/* Define if your system has a prototype for isinf in math.h. */ #undef HAVE_PROTOTYPE_ISINF -/* Define if your system has a prototype for isnan in math.h */ +/* Define if your system has a prototype for isnan in math.h. */ #undef HAVE_PROTOTYPE_ISNAN /* Define if your system has a prototype for listen in sys/types.h - sys/socket.h */ + sys/socket.h. */ #undef HAVE_PROTOTYPE_LISTEN /* Define if your system has a prototype for mkstemp in libc.h unistd.h - stdlib.h */ + stdlib.h. */ #undef HAVE_PROTOTYPE_MKSTEMP /* Define if your system has a prototype for mktemp in libc.h unistd.h - stdlib.h */ + stdlib.h. */ #undef HAVE_PROTOTYPE_MKTEMP /* Define if your system has a prototype for select in sys/select.h - sys/types.h sys/socket.h sys/time.h */ + sys/types.h sys/socket.h sys/time.h. */ #undef HAVE_PROTOTYPE_SELECT /* Define if your system has a prototype for setsockopt in sys/types.h - sys/socket.h */ + sys/socket.h. */ #undef HAVE_PROTOTYPE_SETSOCKOPT /* Define if your system has a prototype for socket in sys/types.h - sys/socket.h */ + sys/socket.h. */ #undef HAVE_PROTOTYPE_SOCKET -/* Define if your system has a prototype for std::finite in cmath */ +/* Define if your system has a prototype for std::finite in cmath. */ #undef HAVE_PROTOTYPE_STD__FINITE -/* Define if your system has a prototype for std::isinf in cmath */ +/* Define if your system has a prototype for std::isinf in cmath. */ #undef HAVE_PROTOTYPE_STD__ISINF -/* Define if your system has a prototype for std::isnan in cmath */ +/* Define if your system has a prototype for std::isnan in cmath. */ #undef HAVE_PROTOTYPE_STD__ISNAN -/* Define if your system has a prototype for std::vfprintf in stdarg.h stdio.h - */ +/* Define if your system has a prototype for std::vfprintf in stdarg.h + stdio.h. */ #undef HAVE_PROTOTYPE_STD__VFPRINTF /* Define if your system has a prototype for std::vsnprintf in stdarg.h - stdio.h */ + stdio.h. */ #undef HAVE_PROTOTYPE_STD__VSNPRINTF -/* Define if your system has a prototype for strcasecmp in string.h */ +/* Define if your system has a prototype for strcasecmp in string.h. */ #undef HAVE_PROTOTYPE_STRCASECMP -/* Define if your system has a prototype for strerror_r in string.h */ +/* Define if your system has a prototype for strerror_r in string.h. */ #undef HAVE_PROTOTYPE_STRERROR_R -/* Define if your system has a prototype for strncasecmp in string.h */ +/* Define if your system has a prototype for strncasecmp in string.h. */ #undef HAVE_PROTOTYPE_STRNCASECMP /* Define if your system has a prototype for usleep in libc.h unistd.h - stdlib.h */ + stdlib.h. */ #undef HAVE_PROTOTYPE_USLEEP -/* Define if your system has a prototype for vsnprintf in stdio.h stdarg.h */ +/* Define if your system has a prototype for vsnprintf in stdio.h stdarg.h. */ #undef HAVE_PROTOTYPE_VSNPRINTF /* Define if your system has a prototype for wait3 in libc.h sys/wait.h - sys/time.h sys/resource.h */ + sys/time.h sys/resource.h. */ #undef HAVE_PROTOTYPE_WAIT3 /* Define if your system has a prototype for waitpid in sys/wait.h sys/time.h - sys/resource.h */ + sys/resource.h. */ #undef HAVE_PROTOTYPE_WAITPID -/* Define if your system has a prototype for _stricmp in string.h */ +/* Define if your system has a prototype for _stricmp in string.h. */ #undef HAVE_PROTOTYPE__STRICMP /* Define to 1 if you have the header file. */ @@ -693,13 +721,16 @@ typedef unsigned short ushort; /* Define to 1 if you have the header file. */ #undef HAVE_PWD_H +/* Define if the random_access iterator category is supported. */ +#undef HAVE_RANDOM_ACCESS_ITERATOR_CATEGORY + /* Define if OpenSSL provides the RAND_egd function. */ #undef HAVE_RAND_EGD /* Define to 1 if you have the `readdir_r' function. */ #undef HAVE_READDIR_R -/* define if the compiler supports reinterpret_cast<> */ +/* Define if the compiler supports reinterpret_cast<>. */ #undef HAVE_REINTERPRET_CAST /* Define to 1 if you have the `rindex' function. */ @@ -747,11 +778,11 @@ typedef unsigned short ushort; /* Define if the compiler supports static_assert */ #undef HAVE_STATIC_ASSERT -/* define if the compiler supports static_cast<> */ +/* Define if the compiler supports static_cast<>. */ #undef HAVE_STATIC_CAST -/* Define if your C++ compiler can work with static methods in class templates - */ +/* Define if your C++ compiler can work with static methods in class + templates. */ #undef HAVE_STATIC_TEMPLATE_METHOD /* Define to 1 if you have the header file. */ @@ -775,10 +806,10 @@ typedef unsigned short ushort; /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define if ANSI standard C++ includes use std namespace */ +/* Define if ANSI standard C++ includes use std namespace. */ #undef HAVE_STD_NAMESPACE -/* Define if the compiler supports std::nothrow */ +/* Define if the compiler supports std::nothrow. */ #undef HAVE_STD__NOTHROW /* Define if STL's algorithm should be used. */ @@ -856,10 +887,10 @@ typedef unsigned short ushort; /* Define to 1 if you have the header file. */ #undef HAVE_SYNCH_H -/* Define if __sync_add_and_fetch is available */ +/* Define if __sync_add_and_fetch is available. */ #undef HAVE_SYNC_ADD_AND_FETCH -/* Define if __sync_sub_and_fetch is available */ +/* Define if __sync_sub_and_fetch is available. */ #undef HAVE_SYNC_SUB_AND_FETCH /* Define to 1 if you have the `sysinfo' function. */ @@ -936,7 +967,7 @@ typedef unsigned short ushort; /* Define to 1 if you have the `tmpnam' function. */ #undef HAVE_TMPNAM -/* define if the compiler recognizes typename */ +/* Define if the compiler recognizes typename. */ #undef HAVE_TYPENAME /* Define to 1 if the system has the type `uint64_t'. */ @@ -1003,7 +1034,7 @@ typedef unsigned short ushort; /* Define if libc.h should be treated as a C++ header */ #undef INCLUDE_LIBC_H_AS_CXX -/* Define if fails if included extern "C" */ +/* Define if fails if included extern "C". */ #undef INCLUDE_MATH_H_AS_CXX /* Define if the second argument to iconv() is const. */ @@ -1042,7 +1073,7 @@ typedef unsigned short ushort; /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE -/* Define if signal handlers need ellipse (...) parameters */ +/* Define if signal handlers need ellipse (...) parameters. */ #undef SIGNAL_HANDLER_WITH_ELLIPSE /* The size of `char', as computed by sizeof. */ @@ -1115,6 +1146,9 @@ typedef unsigned short ushort; /* Define if we are compiling with libxml support. */ #undef WITH_LIBXML +/* Define if we are compiling with OpenJPEG support. */ +#undef WITH_OPENJPEG + /* Define if we are compiling with OpenSSL support. */ #undef WITH_OPENSSL diff --git a/config/tests/arith.cc b/config/tests/arith.cc index b23d18a1..c2cdd9db 100644 --- a/config/tests/arith.cc +++ b/config/tests/arith.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2014-2017, OFFIS e.V. + * Copyright (C) 2014-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -338,9 +338,16 @@ static void provoke_snan() _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() & ~_MM_MASK_INVALID ); #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT) feenableexcept( FE_INVALID ); -#elif defined(HAVE_IEEEFP_H) +#elif defined(HAVE_IEEEFP_H) && !defined(__CYGWIN__) + // Cygwin unfortunately seems to have but no implementation of fgetmask/fpsetmask fp_except cw = fpgetmask(); + +#ifdef FP_X_DX + // on some systems, the devide-by-zero flag is called FP_X_DX + fpsetmask(cw | FP_X_INV | FP_X_DX | FP_X_OFL); +#else fpsetmask(cw | FP_X_INV | FP_X_DZ | FP_X_OFL); +#endif #endif // Visual Studio will emit an exception the moment // we assign a signaling NaN to another float variable @@ -368,10 +375,18 @@ static int test_snan( STD_NAMESPACE ostream& out, const char* name ) _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() | _MM_MASK_INVALID ); #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT) fedisableexcept( FE_INVALID ); -#elif defined(HAVE_IEEEFP_H) +#elif defined(HAVE_IEEEFP_H) && !defined(__CYGWIN__) + // Cygwin unfortunately seems to have but no implementation of fgetmask/fpsetmask fp_except cw = fpgetmask(); + +#ifdef FP_X_DX + // on some systems, the devide-by-zero flag is called FP_X_DX + fpsetmask(cw & ~(FP_X_INV | FP_X_DX | FP_X_OFL)); +#else fpsetmask(cw & ~(FP_X_INV | FP_X_DZ | FP_X_OFL)); #endif + +#endif #endif // Print and return the result print_flag diff --git a/config/tests/cxx11.cc b/config/tests/cxx11.cc index e1d023d9..05c5e8b3 100644 --- a/config/tests/cxx11.cc +++ b/config/tests/cxx11.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017, OFFIS e.V. + * Copyright (C) 2017-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -16,6 +16,25 @@ * * Purpose: Presents constructs that every C++11 compliant * compiler should be able to compile. + * + * + * This file is based on ax_cxx_compile_stdcxx from the GNU Autoconf project. + * The original license is as follows: + * + * LICENSE + * + * Copyright (c) 2008 Benjamin Kosnik + * Copyright (c) 2012 Zack Weinberg + * Copyright (c) 2013 Roy Stogner + * Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov + * Copyright (c) 2015 Paul Norman + * Copyright (c) 2015 Moritz Klammler + * Copyright (c) 2016 Krzesimir Nowak + * + * Copying and distribution of this file, with or without modification, are + * permitted in any medium without royalty provided the copyright notice + * and this notice are preserved. This file is offered as-is, without any + * warranty. */ #ifndef __cplusplus @@ -35,21 +54,17 @@ int main() namespace cxx11 { - namespace test_static_assert { - template struct check { static_assert(sizeof(int) <= sizeof(T), "not big enough"); }; - } namespace test_final_override { - struct Base { virtual void f() {} @@ -59,25 +74,21 @@ namespace cxx11 { virtual void f() override {} }; - } namespace test_double_right_angle_brackets { - - template < typename T > + template struct check {}; typedef check single_type; typedef check> double_type; typedef check>> triple_type; typedef check>>> quadruple_type; - } namespace test_decltype { - int f() { @@ -85,12 +96,10 @@ namespace cxx11 decltype(a) b = 2; return a + b; } - } namespace test_type_deduction { - template < typename T1, typename T2 > struct is_same { @@ -127,23 +136,19 @@ namespace cxx11 static_assert(is_same::value == true, ""); return (sumf > 0.0) ? sumi : add(c, v); } - } namespace test_noexcept { - int f() { return 0; } int g() noexcept { return 0; } static_assert(noexcept(f()) == false, ""); static_assert(noexcept(g()) == true, ""); - } namespace test_constexpr { - template < typename CharT > unsigned long constexpr strlen_c_r(const CharT *const s, const unsigned long acc) noexcept @@ -162,12 +167,10 @@ namespace cxx11 static_assert(strlen_c("1") == 1UL, ""); static_assert(strlen_c("example") == 7UL, ""); static_assert(strlen_c("another\0example") == 7UL, ""); - } namespace test_rvalue_references { - template < int N > struct answer { @@ -187,12 +190,10 @@ namespace cxx11 static_assert(decltype(f(c))::value == 2, ""); static_assert(decltype(f(0))::value == 3, ""); } - } namespace test_uniform_initialization { - struct test { static const int zero {}; @@ -201,12 +202,10 @@ namespace cxx11 static_assert(test::zero == 0, ""); static_assert(test::one == 1, ""); - } namespace test_lambdas { - void test1() { @@ -245,12 +244,10 @@ namespace cxx11 }; return higher1st(nullary) + higher2nd(nullary)(unary); } - } namespace test_variadic_templates { - template struct sum; @@ -272,7 +269,6 @@ namespace cxx11 static_assert(sum<1, 2>::value == 3, ""); static_assert(sum<5, 5, 11>::value == 21, ""); static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); - } // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae @@ -280,7 +276,6 @@ namespace cxx11 // because of this. namespace test_template_alias_sfinae { - struct foo {}; template @@ -295,9 +290,7 @@ namespace cxx11 void test(); void test() { func(0); } - } - } // namespace cxx11 #endif // __cplusplus >= 201103L diff --git a/config/tests/cxx14.cc b/config/tests/cxx14.cc new file mode 100644 index 00000000..801803b0 --- /dev/null +++ b/config/tests/cxx14.cc @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: config + * + * Author: Jan Schlamelcher + * + * Purpose: Presents constructs that every C++14 compliant + * compiler should be able to compile. + * + * + * This file is based on ax_cxx_compile_stdcxx from the GNU Autoconf project. + * The original license is as follows: + * + * LICENSE + * + * Copyright (c) 2008 Benjamin Kosnik + * Copyright (c) 2012 Zack Weinberg + * Copyright (c) 2013 Roy Stogner + * Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov + * Copyright (c) 2015 Paul Norman + * Copyright (c) 2015 Moritz Klammler + * Copyright (c) 2016 Krzesimir Nowak + * + * Copying and distribution of this file, with or without modification, are + * permitted in any medium without royalty provided the copyright notice + * and this notice are preserved. This file is offered as-is, without any + * warranty. + */ + +// If the compiler admits that it is not ready for C++14, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L + +#error "This is not a C++14 compiler" + +#else + +int main() +{ + return 0; +} + +namespace cxx14 +{ + namespace test_polymorphic_lambdas + { + int + test() + { + const auto lambda = [](auto&&... args){ + const auto istiny = [](auto x){ + return (sizeof(x) == 1UL) ? 1 : 0; + }; + const int aretiny[] = { istiny(args)... }; + return aretiny[0]; + }; + return lambda(1, 1L, 1.0f, '1'); + } + } + + namespace test_binary_literals + { + constexpr auto ivii = 0b0000000000101010; + static_assert(ivii == 42, "wrong value"); + } + + namespace test_generalized_constexpr + { + template < typename CharT > + constexpr unsigned long + strlen_c(const CharT *const s) noexcept + { + auto length = 0UL; + for (auto p = s; *p; ++p) + ++length; + return length; + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("x") == 1UL, ""); + static_assert(strlen_c("test") == 4UL, ""); + static_assert(strlen_c("another\0test") == 7UL, ""); + } + + namespace test_lambda_init_capture + { + int + test() + { + auto x = 0; + const auto lambda1 = [a = x](int b){ return a + b; }; + const auto lambda2 = [a = lambda1(x)](){ return a; }; + return lambda2(); + } + } + + namespace test_digit_separators + { + constexpr auto ten_million = 100'000'000; + static_assert(ten_million == 100000000, ""); + } + + namespace test_return_type_deduction + { + auto f(int& x) { return x; } + decltype(auto) g(int& x) { return x; } + + template < typename T1, typename T2 > + struct is_same + { + static constexpr auto value = false; + }; + + template < typename T > + struct is_same + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same::value, ""); + static_assert(is_same::value, ""); + return x; + } + } +} // namespace cxx14 + +#endif // __cplusplus >= 201402L diff --git a/config/tests/cxx17.cc b/config/tests/cxx17.cc new file mode 100644 index 00000000..93d2e82d --- /dev/null +++ b/config/tests/cxx17.cc @@ -0,0 +1,383 @@ +/* + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: config + * + * Author: Jan Schlamelcher + * + * Purpose: Presents constructs that every C++17 compliant + * compiler should be able to compile. + * + * + * This file is based on ax_cxx_compile_stdcxx from the GNU Autoconf project. + * The original license is as follows: + * + * LICENSE + * + * Copyright (c) 2008 Benjamin Kosnik + * Copyright (c) 2012 Zack Weinberg + * Copyright (c) 2013 Roy Stogner + * Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov + * Copyright (c) 2015 Paul Norman + * Copyright (c) 2015 Moritz Klammler + * Copyright (c) 2016 Krzesimir Nowak + * + * Copying and distribution of this file, with or without modification, are + * permitted in any medium without royalty provided the copyright notice + * and this notice are preserved. This file is offered as-is, without any + * warranty. + */ + +// If the compiler admits that it is not ready for C++17, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201703L + +#error "This is not a C++17 compiler" + +#else + +int main() +{ + return 0; +} + +#include +#include +#include + +namespace cxx17 +{ + namespace test_constexpr_lambdas + { + constexpr int foo = [](){return 42;}(); + } + + namespace test::nested_namespace::definitions + { + + } + + namespace test_fold_expression + { + template + int multiply(Args... args) + { + return (args * ... * 1); + } + + template + bool all(Args... args) + { + return (args && ...); + } + } + + namespace test_extended_static_assert + { + static_assert (true); + } + + namespace test_auto_brace_init_list + { + auto foo = {5}; + auto bar {5}; + + static_assert(std::is_same, decltype(foo)>::value); + static_assert(std::is_same::value); + } + + namespace test_typename_in_template_template_parameter + { + template typename X> struct D; + } + + namespace test_fallthrough_nodiscard_maybe_unused_attributes + { + int f1() + { + return 42; + } + + [[nodiscard]] int f2() + { + [[maybe_unused]] auto unused = f1(); + + switch (f1()) + { + case 17: + f1(); + [[fallthrough]]; + case 42: + f1(); + } + return f1(); + } + } + + namespace test_extended_aggregate_initialization + { + struct base1 + { + int b1, b2 = 42; + }; + + struct base2 + { + base2() { + b3 = 42; + } + int b3; + }; + + struct derived : base1, base2 + { + int d; + }; + + derived d1 {{1, 2}, {}, 4}; // full initialization + derived d2 {{}, {}, 4}; // value-initialized bases + } + + namespace test_general_range_based_for_loop + { + struct iter + { + int i; + + int& operator* () + { + return i; + } + + const int& operator* () const + { + return i; + } + + iter& operator++() + { + ++i; + return *this; + } + }; + + struct sentinel + { + int i; + }; + + bool operator== (const iter& i, const sentinel& s) + { + return i.i == s.i; + } + + bool operator!= (const iter& i, const sentinel& s) + { + return !(i == s); + } + + struct range + { + iter begin() const + { + return {0}; + } + + sentinel end() const + { + return {5}; + } + }; + + void f() + { + range r {}; + + for (auto i : r) + { + [[maybe_unused]] auto v = i; + } + } + } + + namespace test_lambda_capture_asterisk_this_by_value + { + struct t + { + int i; + int foo() + { + return [*this]() + { + return i; + }(); + } + }; + } + + namespace test_enum_class_construction + { + enum class byte : unsigned char + {}; + + byte foo {42}; + } + + namespace test_constexpr_if + { + template + int f () + { + if constexpr(cond) + { + return 13; + } + else + { + return 42; + } + } + } + + namespace test_selection_statement_with_initializer + { + int f() + { + return 13; + } + + int f2() + { + if (auto i = f(); i > 0) + { + return 3; + } + + switch (auto i = f(); i + 4) + { + case 17: + return 2; + + default: + return 1; + } + } + } + + namespace test_template_argument_deduction_for_class_templates + { + template + struct pair + { + pair (T1 p1, T2 p2) + : m1 {p1}, + m2 {p2} + {} + + T1 m1; + T2 m2; + }; + + void f() + { + [[maybe_unused]] auto p = pair{13, 42u}; + } + } + + namespace test_non_type_auto_template_parameters + { + template + struct B + {}; + + B<5> b1; + B<'a'> b2; + } + + namespace test_structured_bindings + { + int arr[2] = { 1, 2 }; + std::pair pr = { 1, 2 }; + + auto f1() -> int(&)[2] + { + return arr; + } + + auto f2() -> std::pair& + { + return pr; + } + + struct S + { + int x1 : 2; + volatile double y1; + }; + + S f3() + { + return {}; + } + + auto [ x1, y1 ] = f1(); + auto& [ xr1, yr1 ] = f1(); + auto [ x2, y2 ] = f2(); + auto& [ xr2, yr2 ] = f2(); + const auto [ x3, y3 ] = f3(); + } + + namespace test_exception_spec_type_system + { + struct Good {}; + struct Bad {}; + + void g1() noexcept; + void g2(); + + template + Bad + f(T*, T*); + + template + Good + f(T1*, T2*); + + static_assert (std::is_same_v); + } + + namespace test_inline_variables + { + template void f(T) + {} + + template inline T g(T) + { + return T{}; + } + + template<> inline void f<>(int) + {} + + template<> int g<>(int) + { + return 5; + } + } +} // namespace cxx17 + +#endif // __cplusplus <= 201703L diff --git a/configure b/configure deleted file mode 100755 index 095fc68a..00000000 --- a/configure +++ /dev/null @@ -1,69 +0,0 @@ -#! /bin/sh -if test -d config ; then - if test -f config/modules ; then - tmp=`cat config/modules` - modules=`ls -d $tmp` - else - for dir in `ls`; do - if test -d $dir ; then - modules="$modules $dir" - fi - done - fi - modules=`echo $modules | sed -e "s/config//g" | sed -e "s/CVS//g"` - modules="config $modules doxygen" -else - echo "Cannot find configure directory (config or ../config)" - exit 1 -fi -if test "x--help" = "x$*"; then - config/configure --help -elif test "x--help=short" = "x$*"; then - config/configure --help=short -elif test "x--help=recursive" = "x$*"; then - config/configure --help=recursive -elif test "x--version" = "x$*"; then - config/configure --version -elif test "x-h" = "x$*"; then - config/configure -h -elif test "x-V" = "x$*"; then - config/configure -V -else - args="" - ok=0 - while [ $# -gt 0 ]; do - if test "x--ignore-deprecation" = "x$1"; then - ok=1 - else - args="$args $1" - fi - shift - done - if [ $ok -eq 0 ]; then - echo "" - echo "== DEPRECATION WARNING ==" - echo "" - echo "Configuring DCMTK via GNU Autoconf is deprecated and will be removed. Please have" - echo "a look at CMake, which we now consider equally mature. If you run into serious" - echo "problems using CMake or strongly prefer GNU Autoconf for some other reason write" - echo "an email to the" - echo "" - echo " DCMTK Team " - echo "" - echo "and use" - echo "" - echo " ./configure --ignore-deprecation" - echo "" - echo "to run the old configure script anyway." - echo "" - exit 1 - fi - for module in $modules ; do - echo "Running configure for module $module." - if test ! -x "$module/configure" ; then - echo "Module $module does not contain a configure script!" >&2 - exit 1 - fi - (cd $module && ./configure $args ) || exit 1 - done -fi diff --git a/dcmdata/apps/Makefile.dep b/dcmdata/apps/Makefile.dep index ca174d18..5ea5d2d3 100644 --- a/dcmdata/apps/Makefile.dep +++ b/dcmdata/apps/Makefile.dep @@ -1,5 +1,4 @@ cda2dcm.o: cda2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ - ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ @@ -7,6 +6,7 @@ cda2dcm.o: cda2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../../oflog/include/dcmtk/oflog/config/defines.h \ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ ../../oflog/include/dcmtk/oflog/loglevel.h \ @@ -32,33 +32,29 @@ cda2dcm.o: cda2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -79,12 +75,16 @@ cda2dcm.o: cda2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dccodec.h ../include/dcmtk/dcmdata/dcencdoc.h \ - ../include/dcmtk/dcmdata/dcpath.h \ - ../../ofstd/include/dcmtk/ofstd/ofxml.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcencdoc.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h dcm2json.o: dcm2json.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ @@ -119,33 +119,29 @@ dcm2json.o: dcm2json.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -166,10 +162,16 @@ dcm2json.o: dcm2json.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcjson.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcjson.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h dcm2pdf.o: dcm2pdf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ @@ -205,33 +207,29 @@ dcm2pdf.o: dcm2pdf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -252,9 +250,16 @@ dcm2pdf.o: dcm2pdf.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcistrmz.h dcm2xml.o: dcm2xml.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dctypes.h \ @@ -290,33 +295,29 @@ dcm2xml.o: dcm2xml.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -337,9 +338,16 @@ dcm2xml.o: dcm2xml.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h dcmconv.o: dcmconv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ @@ -375,33 +383,29 @@ dcmconv.o: dcmconv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -422,9 +426,16 @@ dcmconv.o: dcmconv.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcostrmz.h ../include/dcmtk/dcmdata/dcistrmz.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h dcmcrle.o: dcmcrle.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -461,33 +472,29 @@ dcmcrle.o: dcmcrle.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -508,9 +515,16 @@ dcmcrle.o: dcmcrle.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcrleerg.h dcmdrle.o: dcmdrle.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ @@ -546,33 +560,29 @@ dcmdrle.o: dcmdrle.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -593,9 +603,16 @@ dcmdrle.o: dcmdrle.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcrledrg.h dcmdump.o: dcmdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ @@ -631,33 +648,29 @@ dcmdump.o: dcmdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -678,9 +691,16 @@ dcmdump.o: dcmdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcistrmz.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h dcmftest.o: dcmftest.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -725,18 +745,18 @@ dcmftest.o: dcmftest.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcuid.h dcmgpdir.o: dcmgpdir.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dctypes.h \ @@ -772,33 +792,29 @@ dcmgpdir.o: dcmgpdir.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -819,10 +835,16 @@ dcmgpdir.o: dcmgpdir.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcddirif.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcddirif.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h dcmodify.o: dcmodify.cc ../../config/include/dcmtk/config/osconfig.h \ mdfconen.h ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -858,20 +880,18 @@ dcmodify.o: dcmodify.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmdata/dcpath.h ../include/dcmtk/dcmdata/dcdatset.h \ ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dcobject.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dctag.h \ @@ -958,10 +978,12 @@ dump2dcm.o: dump2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcpxitem.h ../include/dcmtk/dcmdata/dcostrmz.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcpxitem.h \ + ../include/dcmtk/dcmdata/dcostrmz.h img2dcm.o: img2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ @@ -1066,21 +1088,21 @@ mdfconen.o: mdfconen.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h mdfdsman.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctk.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h mdfdsman.h \ + ../include/dcmtk/dcmdata/dctagkey.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dctk.h \ ../include/dcmtk/dcmdata/dcswap.h ../include/dcmtk/dcmdata/dcerror.h \ ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctag.h \ @@ -1112,10 +1134,11 @@ mdfconen.o: mdfconen.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcistrmz.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcistrmz.h mdfdsman.o: mdfdsman.cc ../../config/include/dcmtk/config/osconfig.h \ mdfdsman.h ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -1152,19 +1175,18 @@ mdfdsman.o: mdfdsman.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dcswap.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcistrma.h \ ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ @@ -1196,12 +1218,13 @@ mdfdsman.o: mdfdsman.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcpath.h ../include/dcmtk/dcmdata/dcistrmf.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcpath.h \ + ../include/dcmtk/dcmdata/dcistrmf.h pdf2dcm.o: pdf2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ - ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ @@ -1209,6 +1232,7 @@ pdf2dcm.o: pdf2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../../oflog/include/dcmtk/oflog/config/defines.h \ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ ../../oflog/include/dcmtk/oflog/loglevel.h \ @@ -1234,33 +1258,29 @@ pdf2dcm.o: pdf2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -1281,14 +1301,17 @@ pdf2dcm.o: pdf2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dccodec.h ../include/dcmtk/dcmdata/dcencdoc.h \ - ../include/dcmtk/dcmdata/dcpath.h \ - ../../ofstd/include/dcmtk/ofstd/ofxml.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcencdoc.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h stl2dcm.o: stl2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ - ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ @@ -1296,6 +1319,7 @@ stl2dcm.o: stl2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../../oflog/include/dcmtk/oflog/config/defines.h \ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ ../../oflog/include/dcmtk/oflog/loglevel.h \ @@ -1321,33 +1345,29 @@ stl2dcm.o: stl2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -1368,12 +1388,16 @@ stl2dcm.o: stl2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dccodec.h ../include/dcmtk/dcmdata/dcencdoc.h \ - ../include/dcmtk/dcmdata/dcpath.h \ - ../../ofstd/include/dcmtk/ofstd/ofxml.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcencdoc.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h xml2dcm.o: xml2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ @@ -1408,33 +1432,29 @@ xml2dcm.o: xml2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdicdir.h \ + ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcdicent.h ../include/dcmtk/dcmdata/dchashdi.h \ + ../include/dcmtk/dcmdata/dcdict.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdicdir.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ @@ -1455,7 +1475,14 @@ xml2dcm.o: xml2dcm.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcpxitem.h ../include/dcmtk/dcmdata/dcostrmz.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcpxitem.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../include/dcmtk/dcmdata/dcostrmz.h diff --git a/dcmdata/apps/cda2dcm.cc b/dcmdata/apps/cda2dcm.cc index f4bdae92..e44ba7ad 100755 --- a/dcmdata/apps/cda2dcm.cc +++ b/dcmdata/apps/cda2dcm.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2018, OFFIS e.V. + * Copyright (C) 2018-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -20,31 +20,9 @@ */ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first*/ - -#define INCLUDE_CSTDLIB -#define INCLUDE_CSTDIO -#define INCLUDE_CSTRING -#include "dcmtk/ofstd/ofstdinc.h" #include "dcmtk/dcmdata/dctk.h" -#include "dcmtk/dcmdata/cmdlnarg.h" -#include "dcmtk/ofstd/ofconapp.h" -#include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */ -#include "dcmtk/ofstd/ofstd.h" -#include "dcmtk/ofstd/ofdatime.h" -#include "dcmtk/dcmdata/dccodec.h" #include "dcmtk/dcmdata/dcencdoc.h" - -BEGIN_EXTERN_C -#ifdef HAVE_FCNTL_H -#include /* for O_RDONLY */ -#endif -#ifdef HAVE_SYS_TYPES_H -#include /* required for sys/stat.h */ -#endif -#ifdef HAVE_SYS_STAT_H -#include /* for stat, fstat */ -#endif -END_EXTERN_C +#include "dcmtk/ofstd/ofconapp.h" #ifdef WITH_ZLIB #include /* for zlibVersion() */ diff --git a/dcmdata/apps/dcm2pdf.cc b/dcmdata/apps/dcm2pdf.cc index 2f0d1378..67453aa5 100644 --- a/dcmdata/apps/dcm2pdf.cc +++ b/dcmdata/apps/dcm2pdf.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2012, OFFIS e.V. + * Copyright (C) 2007-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -313,10 +313,12 @@ int main(int argc, char *argv[]) } /* strip pad byte at end of file, if there is one. The PDF format expects - * files to end with %%EOF followed by CR/LF. If the last character of the - * file is not a CR or LF, we assume it is a pad byte and remove it. + * files to end with %%EOF followed by CR/LF (although in some cases the + * CR/LF may be missing or you might only find CR or LF). + * If the last character of the file is not a CR or LF, and not the + * letter 'F', we assume it is either trailing garbage or a pad byte, and remove it. */ - if (pdfDocument[len-1] != 10 && pdfDocument[len-1] != 13) + if (pdfDocument[len-1] != 10 && pdfDocument[len-1] != 13 && pdfDocument[len-1] != 'F') { --len; } diff --git a/dcmdata/apps/dcm2xml.cc b/dcmdata/apps/dcm2xml.cc index 48d7e3c0..825abc60 100644 --- a/dcmdata/apps/dcm2xml.cc +++ b/dcmdata/apps/dcm2xml.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2002-2016, OFFIS e.V. + * Copyright (C) 2002-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -184,11 +184,7 @@ static OFCondition writeFile(STD_NAMESPACE ostream &out, { out << " [" << OFendl; /* copy content from DTD file */ -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE ifstream dtdFile(dtdFilename, STD_NAMESPACE ios::in | STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE ifstream dtdFile(dtdFilename, STD_NAMESPACE ios::in); -#endif + STD_NAMESPACE ifstream dtdFile(dtdFilename, OFopenmode_in_nocreate); if (dtdFile) { char c; diff --git a/dcmdata/apps/mdfconen.cc b/dcmdata/apps/mdfconen.cc index 8119546c..9c089eb5 100644 --- a/dcmdata/apps/mdfconen.cc +++ b/dcmdata/apps/mdfconen.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2018, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -24,6 +24,7 @@ #include "mdfconen.h" #include "mdfdsman.h" #include "dcmtk/ofstd/ofstd.h" +#include "dcmtk/ofstd/ofconapp.h" #include "dcmtk/dcmdata/dctk.h" #include "dcmtk/dcmdata/dcistrmz.h" /* for dcmZlibExpectRFC1950Encoding */ @@ -463,7 +464,7 @@ int MdfConsoleEngine::executeJob(const MdfJob &job, else if (job.option == "mf") result = ds_man->modifyOrInsertFromFile(job.path, job.value /*filename*/, OFTrue, update_metaheader_uids_option, ignore_missing_tags_option, no_reservation_checks); else if (job.option == "ma") - result = ds_man->modifyAllTags(job.path, job.value, update_metaheader_uids_option, count); + result = ds_man->modifyAllTags(job.path, job.value, update_metaheader_uids_option, count, ignore_missing_tags_option); else if (job.option == "e") result = ds_man->deleteTag(job.path, OFFalse, ignore_missing_tags_option); else if (job.option == "ea") diff --git a/dcmdata/apps/mdfconen.h b/dcmdata/apps/mdfconen.h index 7c1462bf..4a757419 100644 --- a/dcmdata/apps/mdfconen.h +++ b/dcmdata/apps/mdfconen.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2018, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -26,6 +26,7 @@ #include "dcmtk/ofstd/ofcond.h" #include "dcmtk/dcmdata/dcxfer.h" +#include "dcmtk/ofstd/ofcmdln.h" // forward declarations diff --git a/dcmdata/apps/mdfdsman.h b/dcmdata/apps/mdfdsman.h index 4e0596dc..f2b227a2 100644 --- a/dcmdata/apps/mdfdsman.h +++ b/dcmdata/apps/mdfdsman.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2017, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -27,6 +27,7 @@ #include "dcmtk/ofstd/ofcond.h" #include "dcmtk/dcmdata/dctagkey.h" #include "dcmtk/dcmdata/dcxfer.h" +#include "dcmtk/ofstd/ofcmdln.h" // forward declarations diff --git a/dcmdata/apps/pdf2dcm.cc b/dcmdata/apps/pdf2dcm.cc index 7c10f5ba..95839753 100644 --- a/dcmdata/apps/pdf2dcm.cc +++ b/dcmdata/apps/pdf2dcm.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2005-2018, OFFIS e.V. + * Copyright (C) 2005-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -20,31 +20,9 @@ */ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ - -#define INCLUDE_CSTDLIB -#define INCLUDE_CSTDIO -#define INCLUDE_CSTRING -#include "dcmtk/ofstd/ofstdinc.h" #include "dcmtk/dcmdata/dctk.h" -#include "dcmtk/dcmdata/cmdlnarg.h" -#include "dcmtk/ofstd/ofconapp.h" -#include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */ -#include "dcmtk/ofstd/ofstd.h" -#include "dcmtk/ofstd/ofdatime.h" -#include "dcmtk/dcmdata/dccodec.h" #include "dcmtk/dcmdata/dcencdoc.h" - -BEGIN_EXTERN_C -#ifdef HAVE_FCNTL_H -#include /* for O_RDONLY */ -#endif -#ifdef HAVE_SYS_TYPES_H -#include /* required for sys/stat.h */ -#endif -#ifdef HAVE_SYS_STAT_H -#include /* for stat, fstat */ -#endif -END_EXTERN_C +#include "dcmtk/ofstd/ofconapp.h" #ifdef WITH_ZLIB #include /* for zlibVersion() */ diff --git a/dcmdata/apps/stl2dcm.cc b/dcmdata/apps/stl2dcm.cc index b9f91168..d684679d 100755 --- a/dcmdata/apps/stl2dcm.cc +++ b/dcmdata/apps/stl2dcm.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2018, OFFIS e.V. + * Copyright (C) 2018-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -20,31 +20,9 @@ */ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first*/ - -#define INCLUDE_CSTDLIB -#define INCLUDE_CSTDIO -#define INCLUDE_CSTRING -#include "dcmtk/ofstd/ofstdinc.h" #include "dcmtk/dcmdata/dctk.h" -#include "dcmtk/dcmdata/cmdlnarg.h" -#include "dcmtk/ofstd/ofconapp.h" -#include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */ -#include "dcmtk/ofstd/ofstd.h" -#include "dcmtk/ofstd/ofdatime.h" -#include "dcmtk/dcmdata/dccodec.h" #include "dcmtk/dcmdata/dcencdoc.h" - -BEGIN_EXTERN_C -#ifdef HAVE_FCNTL_H -#include /* for O_RDONLY */ -#endif -#ifdef HAVE_SYS_TYPES_H -#include /* required for sys/stat.h */ -#endif -#ifdef HAVE_SYS_STAT_H -#include /* for stat, fstat */ -#endif -END_EXTERN_C +#include "dcmtk/ofstd/ofconapp.h" #ifdef WITH_ZLIB #include /* for zlibVersion() */ diff --git a/dcmdata/apps/xml2dcm.cc b/dcmdata/apps/xml2dcm.cc index c195b805..6392fb9d 100644 --- a/dcmdata/apps/xml2dcm.cc +++ b/dcmdata/apps/xml2dcm.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2018, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -52,8 +52,28 @@ static char rcsid[] = "$dcmtk: " OFFIS_CONSOLE_APPLICATION " v" #ifdef WITH_LIBXML +#ifdef __ibmxl__ +// IBM xlC defines __GNUC__ but does not support the GNUC extension +// __attribute__ ((format (printf, 2, 3))). +// This avoids a compiler warning in . +#define LIBXML_ATTR_FORMAT(fmt,args) +#endif + +// The libxml library also uses unicode. So we have to reuse some +// workarounds for the ICU library here as well. +// The type char16_t is only supported since C++11. +#ifndef HAVE_CHAR16_T +#define UCHAR_TYPE uint16_t +#endif + +//If U_NOEXCEPT is not defined, ICU falls back to NOEXCEPT. +#ifndef HAVE_CXX11 +#define U_NOEXCEPT +#endif + #include + // stores pointer to character encoding handler static xmlCharEncodingHandlerPtr EncodingHandler = NULL; @@ -173,7 +193,14 @@ static OFCondition createNewElement(xmlNodePtr current, DcmTagKey dcmTagKey; unsigned int group = 0xffff; unsigned int elem = 0xffff; - if (sscanf(OFreinterpret_cast(char *, elemTag), "%x,%x", &group, &elem ) == 2) + /* make sure that "tag" attribute exists */ + if (elemTag == NULL) + { + OFLOG_WARN(xml2dcmLogger, "missing 'tag' attribute, ignoring node"); + result = EC_InvalidTag; + } + /* determine group and element number from "tag" */ + else if (sscanf(OFreinterpret_cast(char *, elemTag), "%x,%x", &group, &elem ) == 2) { dcmTagKey.set(OFstatic_cast(Uint16, group), OFstatic_cast(Uint16, elem)); DcmTag dcmTag(dcmTagKey); @@ -182,8 +209,15 @@ static OFCondition createNewElement(xmlNodePtr current, DcmEVR dcmEVR = dcmVR.getEVR(); if (dcmEVR == EVR_UNKNOWN) { - OFLOG_WARN(xml2dcmLogger, "invalid 'vr' attribute (" << elemVR - << ") for " << dcmTag << ", using unknown VR"); + /* check whether "vr" attribute exists */ + if (elemVR == NULL) + { + OFLOG_WARN(xml2dcmLogger, "missing 'vr' attribute for " << dcmTag + << ", using unknown VR"); + } else { + OFLOG_WARN(xml2dcmLogger, "invalid 'vr' attribute (" << elemVR + << ") for " << dcmTag << ", using unknown VR"); + } } /* check for correct vr */ const DcmEVR tagEVR = dcmTag.getEVR(); @@ -503,13 +537,20 @@ static OFCondition parseDataSet(DcmItem *dataset, DcmPixelSequence *sequence = new DcmPixelSequence(DCM_PixelSequenceTag); if (sequence != NULL) { - /* ... insert it into the dataset and proceed with the pixel items */ - OFstatic_cast(DcmPixelData *, newElem)->putOriginalRepresentation(xfer, NULL, sequence); - parsePixelSequence(sequence, current->xmlChildrenNode); + if (newElem->ident() == EVR_PixelData) + { + /* ... insert it into the dataset and proceed with the pixel items */ + OFstatic_cast(DcmPixelData *, newElem)->putOriginalRepresentation(xfer, NULL, sequence); + parsePixelSequence(sequence, current->xmlChildrenNode); + } else + OFLOG_WARN(xml2dcmLogger, "wrong VR for 'sequence' element with pixel data, ignoring child nodes"); } } else { /* proceed parsing the items of the sequence */ - parseSequence(OFstatic_cast(DcmSequenceOfItems *, newElem), current->xmlChildrenNode, xfer); + if (newElem->ident() == EVR_SQ) + parseSequence(OFstatic_cast(DcmSequenceOfItems *, newElem), current->xmlChildrenNode, xfer); + else + OFLOG_WARN(xml2dcmLogger, "wrong VR for 'sequence' element, ignoring child nodes"); } } else { /* delete element if insertion failed */ @@ -892,10 +933,11 @@ int main(int argc, char *argv[]) OFString tmpErrorString; /* initialize the XML library (only required for MT-safety) */ xmlInitParser(); - /* substitute default entities (XML mnenonics) */ - xmlSubstituteEntitiesDefault(1); + /* do not substitute entities (other than the standard ones) */ + xmlSubstituteEntitiesDefault(0); /* add line number to debug messages */ xmlLineNumbersDefault(1); + /* enable libxml warnings and error messages */ xmlGetWarningsDefaultValue = 1; xmlSetGenericErrorFunc(&tmpErrorString, errorFunction); diff --git a/dcmdata/data/dicom.dic b/dcmdata/data/dicom.dic index 39e6b8de..cb5c19bc 100644 --- a/dcmdata/data/dicom.dic +++ b/dcmdata/data/dicom.dic @@ -1,5 +1,5 @@ # -# Copyright (C) 1994-2018, OFFIS e.V. +# Copyright (C) 1994-2019, OFFIS e.V. # All rights reserved. See COPYRIGHT file for details. # # This software and supporting documentation were developed by @@ -21,14 +21,13 @@ # DICONDE (Digital Imaging and Communication in Nondestructive Evaluation) and # DICOS (Digital Imaging and Communications in Security) standard. # -# Generated automatically from DICOM PS 3.6-2018d and PS 3.7-2018d -# File created on 2018-09-19 14:20:31 by J. Riesmeier on thinkpad. -# File updated manually on 2018-11-15 by J. Riesmeier. +# Generated automatically from DICOM PS 3.6-2019b and PS 3.7-2019b +# File created on 2019-04-26 14:51:35 by J. Riesmeier on thinkpad. +# File updated manually on 2019-08-07 by J. Riesmeier # # In addition, the data dictionary entries from the following final text # supplements and correction items (CP) have been incorporated: -# - Supplement 188 -# - CP 1803, 1809 +# - Supplement 175 (FT2) # # Each line represents an entry in the data dictionary. Each line has 5 fields # (Tag, VR, Name, VM, Version). Entries need not be in ascending tag order. @@ -200,6 +199,7 @@ (0008,103E) LO SeriesDescription 1 DICOM (0008,103F) SQ SeriesDescriptionCodeSequence 1 DICOM (0008,1040) LO InstitutionalDepartmentName 1 DICOM +(0008,1041) SQ InstitutionalDepartmentTypeCodeSequence 1 DICOM (0008,1048) PN PhysiciansOfRecord 1-n DICOM (0008,1049) SQ PhysiciansOfRecordIdentificationSequence 1 DICOM (0008,1050) PN PerformingPhysicianName 1-n DICOM @@ -568,6 +568,111 @@ (0014,511D) DS WedgeChamferHeight 1 DICOM/DICONDE (0014,511E) CS WedgeCurve 1 DICOM/DICONDE (0014,511F) DS RadiusAlongWedge 1 DICOM/DICONDE +(0016,0001) DS WhitePoint 1 DICOM +(0016,0002) DS PrimaryChromaticities 3 DICOM +(0016,0003) UT BatteryLevel 1 DICOM +(0016,0004) DS ExposureTimeInSeconds 1 DICOM +(0016,0005) DS FNumber 1 DICOM +(0016,0006) IS OECFRows 1 DICOM +(0016,0007) IS OECFColumns 1 DICOM +(0016,0008) UC OECFColumnNames 1-n DICOM +(0016,0009) DS OECFValues 1-n DICOM +(0016,000A) IS SpatialFrequencyResponseRows 1 DICOM +(0016,000B) IS SpatialFrequencyResponseColumns 1 DICOM +(0016,000C) UC SpatialFrequencyResponseColumnNames 1-n DICOM +(0016,000D) DS SpatialFrequencyResponseValues 1-n DICOM +(0016,000E) IS ColorFilterArrayPatternRows 1 DICOM +(0016,000F) IS ColorFilterArrayPatternColumns 1 DICOM +(0016,0010) DS ColorFilterArrayPatternValues 1-n DICOM +(0016,0011) US FlashFiringStatus 1 DICOM +(0016,0012) US FlashReturnStatus 1 DICOM +(0016,0013) US FlashMode 1 DICOM +(0016,0014) US FlashFunctionPresent 1 DICOM +(0016,0015) US FlashRedEyeMode 1 DICOM +(0016,0016) US ExposureProgram 1 DICOM +(0016,0017) UT SpectralSensitivity 1 DICOM +(0016,0018) IS PhotographicSensitivity 1 DICOM +(0016,0019) IS SelfTimerMode 1 DICOM +(0016,001A) US SensitivityType 1 DICOM +(0016,001B) IS StandardOutputSensitivity 1 DICOM +(0016,001C) IS RecommendedExposureIndex 1 DICOM +(0016,001D) IS ISOSpeed 1 DICOM +(0016,001E) IS ISOSpeedLatitudeyyy 1 DICOM +(0016,001F) IS ISOSpeedLatitudezzz 1 DICOM +(0016,0020) UT EXIFVersion 1 DICOM +(0016,0021) DS ShutterSpeedValue 1 DICOM +(0016,0022) DS ApertureValue 1 DICOM +(0016,0023) DS BrightnessValue 1 DICOM +(0016,0024) DS ExposureBiasValue 1 DICOM +(0016,0025) DS MaxApertureValue 1 DICOM +(0016,0026) DS SubjectDistance 1 DICOM +(0016,0027) US MeteringMode 1 DICOM +(0016,0028) US LightSource 1 DICOM +(0016,0029) DS FocalLength 1 DICOM +(0016,002A) IS SubjectArea 2-4 DICOM +(0016,002B) OB MakerNote 1 DICOM +(0016,0030) DS Temperature 1 DICOM +(0016,0031) DS Humidity 1 DICOM +(0016,0032) DS Pressure 1 DICOM +(0016,0033) DS WaterDepth 1 DICOM +(0016,0034) DS Acceleration 1 DICOM +(0016,0035) DS CameraElevationAngle 1 DICOM +(0016,0036) DS FlashEnergy 1-2 DICOM +(0016,0037) IS SubjectLocation 2 DICOM +(0016,0038) DS PhotographicExposureIndex 1 DICOM +(0016,0039) US SensingMethod 1 DICOM +(0016,003A) US FileSource 1 DICOM +(0016,003B) US SceneType 1 DICOM +(0016,0041) US CustomRendered 1 DICOM +(0016,0042) US ExposureMode 1 DICOM +(0016,0043) US WhiteBalance 1 DICOM +(0016,0044) DS DigitalZoomRatio 1 DICOM +(0016,0045) IS FocalLengthIn35mmFilm 1 DICOM +(0016,0046) US SceneCaptureType 1 DICOM +(0016,0047) US GainControl 1 DICOM +(0016,0048) US Contrast 1 DICOM +(0016,0049) US Saturation 1 DICOM +(0016,004A) US Sharpness 1 DICOM +(0016,004B) OB DeviceSettingDescription 1 DICOM +(0016,004C) US SubjectDistanceRange 1 DICOM +(0016,004D) UT CameraOwnerName 1 DICOM +(0016,004E) DS LensSpecification 4 DICOM +(0016,004F) UT LensMake 1 DICOM +(0016,0050) UT LensModel 1 DICOM +(0016,0051) UT LensSerialNumber 1 DICOM +(0016,0061) CS InteroperabilityIndex 1 DICOM +(0016,0062) OB InteroperabilityVersion 1 DICOM +(0016,0070) OB GPSVersionID 1 DICOM +(0016,0071) CS GPSLatitudeRef 1 DICOM +(0016,0072) DS GPSLatitude 3 DICOM +(0016,0073) CS GPSLongitudeRef 1 DICOM +(0016,0074) DS GPSLongitude 3 DICOM +(0016,0075) US GPSAltitudeRef 1 DICOM +(0016,0076) DS GPSAltitude 1 DICOM +(0016,0077) DT GPSTimeStamp 1 DICOM +(0016,0078) UT GPSSatellites 1 DICOM +(0016,0079) CS GPSStatus 1 DICOM +(0016,007A) CS GPSMeasureMode 1 DICOM +(0016,007B) DS GPSDOP 1 DICOM +(0016,007C) CS GPSSpeedRef 1 DICOM +(0016,007D) DS GPSSpeed 1 DICOM +(0016,007E) CS GPSTrackRef 1 DICOM +(0016,007F) DS GPSTrack 1 DICOM +(0016,0080) CS GPSImgDirectionRef 1 DICOM +(0016,0081) DS GPSImgDirection 1 DICOM +(0016,0082) UT GPSMapDatum 1 DICOM +(0016,0083) CS GPSDestLatitudeRef 1 DICOM +(0016,0084) DS GPSDestLatitude 3 DICOM +(0016,0085) CS GPSDestLongitudeRef 1 DICOM +(0016,0086) DS GPSDestLongitude 3 DICOM +(0016,0087) CS GPSDestBearingRef 1 DICOM +(0016,0088) DS GPSDestBearing 1 DICOM +(0016,0089) CS GPSDestDistanceRef 1 DICOM +(0016,008A) DS GPSDestDistance 1 DICOM +(0016,008B) OB GPSProcessingMethod 1 DICOM +(0016,008C) OB GPSAreaInformation 1 DICOM +(0016,008D) DT GPSDateStamp 1 DICOM +(0016,008E) IS GPSDifferential 1 DICOM (0018,0010) LO ContrastBolusAgent 1 DICOM (0018,0012) SQ ContrastBolusAgentSequence 1 DICOM (0018,0013) FL ContrastBolusT1Relaxivity 1 DICOM @@ -1122,6 +1227,42 @@ (0018,9352) FL CalciumScoringMassFactorDevice 3 DICOM (0018,9353) FL EnergyWeightingFactor 1 DICOM (0018,9360) SQ CTAdditionalXRaySourceSequence 1 DICOM +(0018,9361) CS MultienergyCTAcquisition 1 DICOM +(0018,9362) SQ MultienergyCTAcquisitionSequence 1 DICOM +(0018,9363) SQ MultienergyCTProcessingSequence 1 DICOM +(0018,9364) SQ MultienergyCTCharacteristicsSequence 1 DICOM +(0018,9365) SQ MultienergyCTXRaySourceSequence 1 DICOM +(0018,9366) US XRaySourceIndex 1 DICOM +(0018,9367) UC XRaySourceID 1 DICOM +(0018,9368) CS MultienergySourceTechnique 1 DICOM +(0018,9369) DT SourceStartDateTime 1 DICOM +(0018,936A) DT SourceEndDateTime 1 DICOM +(0018,936B) US SwitchingPhaseNumber 1 DICOM +(0018,936C) DS SwitchingPhaseNominalDuration 1 DICOM +(0018,936D) DS SwitchingPhaseTransitionDuration 1 DICOM +(0018,936E) DS EffectiveBinEnergy 1 DICOM +(0018,936F) SQ MultienergyCTXRayDetectorSequence 1 DICOM +(0018,9370) US XRayDetectorIndex 1 DICOM +(0018,9371) UC XRayDetectorID 1 DICOM +(0018,9372) CS MultienergyDetectorType 1 DICOM +(0018,9373) ST XRayDetectorLabel 1 DICOM +(0018,9374) DS NominalMaxEnergy 1 DICOM +(0018,9375) DS NominalMinEnergy 1 DICOM +(0018,9376) US ReferencedXRayDetectorIndex 1-n DICOM +(0018,9377) US ReferencedXRaySourceIndex 1-n DICOM +(0018,9378) US ReferencedPathIndex 1-n DICOM +(0018,9379) SQ MultienergyCTPathSequence 1 DICOM +(0018,937A) US MultienergyCTPathIndex 1 DICOM +(0018,937B) UT MultienergyAcquisitionDescription 1 DICOM +(0018,937C) FD MonoenergeticEnergyEquivalent 1 DICOM +(0018,937D) SQ MaterialCodeSequence 1 DICOM +(0018,937E) CS DecompositionMethod 1 DICOM +(0018,937F) UT DecompositionDescription 1 DICOM +(0018,9380) SQ DecompositionAlgorithmIdentificationSequence 1 DICOM +(0018,9381) SQ DecompositionMaterialSequence 1 DICOM +(0018,9382) SQ MaterialAttenuationSequence 1 DICOM +(0018,9383) DS PhotonEnergy 1 DICOM +(0018,9384) DS XRayMassAttenuationCoefficient 1 DICOM (0018,9401) SQ ProjectionPixelCalibrationSequence 1 DICOM (0018,9402) FL DistanceSourceToIsocenter 1 DICOM (0018,9403) FL DistanceObjectToTableTop 1 DICOM @@ -1499,10 +1640,18 @@ (0022,1029) LO IOLFormulaDetail 1 DICOM (0022,1033) FL KeratometerIndex 1 DICOM (0022,1035) SQ SourceOfOphthalmicAxialLengthCodeSequence 1 DICOM +(0022,1036) SQ SourceOfCornealSizeDataCodeSequence 1 DICOM (0022,1037) FL TargetRefraction 1 DICOM (0022,1039) CS RefractiveProcedureOccurred 1 DICOM (0022,1040) SQ RefractiveSurgeryTypeCodeSequence 1 DICOM (0022,1044) SQ OphthalmicUltrasoundMethodCodeSequence 1 DICOM +(0022,1045) SQ SurgicallyInducedAstigmatismSequence 1 DICOM +(0022,1046) CS TypeOfOpticalCorrection 1 DICOM +(0022,1047) SQ ToricIOLPowerSequence 1 DICOM +(0022,1048) SQ PredictedToricErrorSequence 1 DICOM +(0022,1049) CS PreSelectedForImplantation 1 DICOM +(0022,104A) SQ ToricIOLPowerForExactEmmetropiaSequence 1 DICOM +(0022,104B) SQ ToricIOLPowerForExactTargetRefractionSequence 1 DICOM (0022,1050) SQ OphthalmicAxialLengthMeasurementsSequence 1 DICOM (0022,1053) FL IOLPower 1 DICOM (0022,1054) FL PredictedRefractiveError 1 DICOM @@ -1523,6 +1672,9 @@ (0022,1125) SQ AnteriorChamberDepthDefinitionCodeSequence 1 DICOM (0022,1127) SQ LensThicknessSequence 1 DICOM (0022,1128) SQ AnteriorChamberDepthSequence 1 DICOM +(0022,112A) SQ CalculationCommentSequence 1 DICOM +(0022,112B) CS CalculationCommentType 1 DICOM +(0022,112C) LT CalculationComment 1 DICOM (0022,1130) FL LensThickness 1 DICOM (0022,1131) FL AnteriorChamberDepth 1 DICOM (0022,1132) SQ SourceOfLensThicknessDataCodeSequence 1 DICOM @@ -1884,6 +2036,8 @@ (0032,1034) SQ RequestingServiceCodeSequence 1 DICOM (0032,1060) LO RequestedProcedureDescription 1 DICOM (0032,1064) SQ RequestedProcedureCodeSequence 1 DICOM +(0032,1066) UT ReasonForVisit 1 DICOM +(0032,1067) SQ ReasonForVisitCodeSequence 1 DICOM (0032,1070) LO RequestedContrastAgent 1 DICOM (0038,0004) SQ ReferencedPatientAliasSequence 1 DICOM (0038,0008) CS VisitStatusID 1 DICOM @@ -2123,7 +2277,6 @@ (0040,A124) UI UID 1 DICOM (0040,A130) CS TemporalRangeType 1 DICOM (0040,A132) UL ReferencedSamplePositions 1-n DICOM -(0040,A136) US ReferencedFrameNumbers 1-n DICOM (0040,A138) DS ReferencedTimeOffsets 1-n DICOM (0040,A13A) DT ReferencedDateTime 1-n DICOM (0040,A160) UT TextValue 1 DICOM @@ -2174,6 +2327,7 @@ (0042,0012) LO MIMETypeOfEncapsulatedDocument 1 DICOM (0042,0013) SQ SourceInstanceSequence 1 DICOM (0042,0014) LO ListOfMIMETypes 1-n DICOM +(0042,0015) UL EncapsulatedDocumentLength 1 DICOM (0044,0001) ST ProductPackageIdentifier 1 DICOM (0044,0002) CS SubstanceAdministrationApproval 1 DICOM (0044,0003) LT ApprovalStatusFurtherDescription 1 DICOM @@ -2214,6 +2368,7 @@ (0046,0042) FD ChannelWidth 1 DICOM (0046,0044) FD PupilSize 1 DICOM (0046,0046) FD CornealSize 1 DICOM +(0046,0047) SQ CornealSizeSequence 1 DICOM (0046,0050) SQ AutorefractionRightEyeSequence 1 DICOM (0046,0052) SQ AutorefractionLeftEyeSequence 1 DICOM (0046,0060) FD DistancePupillaryDistance 1 DICOM @@ -2237,6 +2392,15 @@ (0046,0102) SQ AddOtherSequence 1 DICOM (0046,0104) FD AddPower 1 DICOM (0046,0106) FD ViewingDistance 1 DICOM +(0046,0110) SQ CorneaMeasurementsSequence 1 DICOM +(0046,0111) SQ SourceOfCorneaMeasurementDataCodeSequence 1 DICOM +(0046,0112) SQ SteepCornealAxisSequence 1 DICOM +(0046,0113) SQ FlatCornealAxisSequence 1 DICOM +(0046,0114) FD CornealPower 1 DICOM +(0046,0115) FD CornealAxis 1 DICOM +(0046,0116) SQ CorneaMeasurementMethodCodeSequence 1 DICOM +(0046,0117) FL RefractiveIndexOfCornea 1 DICOM +(0046,0118) FL RefractiveIndexOfAqueousHumor 1 DICOM (0046,0121) SQ VisualAcuityTypeCodeSequence 1 DICOM (0046,0122) SQ VisualAcuityRightEyeSequence 1 DICOM (0046,0123) SQ VisualAcuityLeftEyeSequence 1 DICOM @@ -2327,6 +2491,7 @@ (0050,001D) FD ContainerComponentDiameter 1 DICOM (0050,001E) LO ContainerComponentDescription 1 DICOM (0050,0020) LO DeviceDescription 1 DICOM +(0050,0021) ST LongDeviceDescription 1 DICOM (0052,0001) FL ContrastBolusIngredientPercentByVolume 1 DICOM (0052,0002) FD OCTFocalDistance 1 DICOM (0052,0003) FD BeamSpotSize 1 DICOM @@ -3080,6 +3245,8 @@ (0400,0510) UI EncryptedContentTransferSyntaxUID 1 DICOM (0400,0520) OB EncryptedContent 1 DICOM (0400,0550) SQ ModifiedAttributesSequence 1 DICOM +(0400,0551) SQ NonconformingModifiedAttributesSequence 1 DICOM +(0400,0552) OB NonconformingDataElementValue 1 DICOM (0400,0561) SQ OriginalAttributesSequence 1 DICOM (0400,0562) DT AttributeModificationDateTime 1 DICOM (0400,0563) LO ModifyingSystem 1 DICOM @@ -3794,6 +3961,140 @@ (300E,0004) DA ReviewDate 1 DICOM (300E,0005) TM ReviewTime 1 DICOM (300E,0008) PN ReviewerName 1 DICOM +(3010,0001) SQ RadiobiologicalDoseEffectSequence 1 DICOM +(3010,0002) CS RadiobiologicalDoseEffectFlag 1 DICOM +(3010,0003) SQ EffectiveDoseCalculationMethodCategoryCodeSequence 1 DICOM +(3010,0004) SQ EffectiveDoseCalculationMethodCodeSequence 1 DICOM +(3010,0005) LO EffectiveDoseCalculationMethodDescription 1 DICOM +(3010,0006) UI ConceptualVolumeUID 1 DICOM +(3010,0007) SQ OriginatingSOPInstanceReferenceSequence 1 DICOM +(3010,0008) SQ ConceptualVolumeConstituentSequence 1 DICOM +(3010,0009) SQ EquivalentConceptualVolumeInstanceReferenceSequence 1 DICOM +(3010,000A) SQ EquivalentConceptualVolumesSequence 1 DICOM +(3010,000B) UI ReferencedConceptualVolumeUID 1 DICOM +(3010,000C) UT ConceptualVolumeCombinationExpression 1 DICOM +(3010,000D) US ConceptualVolumeConstituentIndex 1 DICOM +(3010,000E) CS ConceptualVolumeCombinationFlag 1 DICOM +(3010,000F) ST ConceptualVolumeCombinationDescription 1 DICOM +(3010,0010) CS ConceptualVolumeSegmentationDefinedFlag 1 DICOM +(3010,0011) SQ ConceptualVolumeSegmentationReferenceSequence 1 DICOM +(3010,0012) SQ ConceptualVolumeConstituentSegmentationReferenceSequence 1 DICOM +(3010,0013) UI ConstituentConceptualVolumeUID 1 DICOM +(3010,0014) SQ DerivationConceptualVolumeSequence 1 DICOM +(3010,0015) UI SourceConceptualVolumeUID 1 DICOM +(3010,0016) SQ ConceptualVolumeDerivationAlgorithmSequence 1 DICOM +(3010,0017) ST ConceptualVolumeDescription 1 DICOM +(3010,0018) SQ SourceConceptualVolumeSequence 1 DICOM +(3010,0019) SQ AuthorIdentificationSequence 1 DICOM +(3010,001A) LO ManufacturerModelVersion 1 DICOM +(3010,001B) UC DeviceAlternateIdentifier 1 DICOM +(3010,001C) CS DeviceAlternateIdentifierType 1 DICOM +(3010,001D) LT DeviceAlternateIdentifierFormat 1 DICOM +(3010,001E) LO SegmentationCreationTemplateLabel 1 DICOM +(3010,001F) UI SegmentationTemplateUID 1 DICOM +(3010,0020) US ReferencedSegmentReferenceIndex 1 DICOM +(3010,0021) SQ SegmentReferenceSequence 1 DICOM +(3010,0022) US SegmentReferenceIndex 1 DICOM +(3010,0023) SQ DirectSegmentReferenceSequence 1 DICOM +(3010,0024) SQ CombinationSegmentReferenceSequence 1 DICOM +(3010,0025) SQ ConceptualVolumeSequence 1 DICOM +(3010,0026) SQ SegmentedRTAccessoryDeviceSequence 1 DICOM +(3010,0027) SQ SegmentCharacteristicsSequence 1 DICOM +(3010,0028) SQ RelatedSegmentCharacteristicsSequence 1 DICOM +(3010,0029) US SegmentCharacteristicsPrecedence 1 DICOM +(3010,002A) SQ RTSegmentAnnotationSequence 1 DICOM +(3010,002B) SQ SegmentAnnotationCategoryCodeSequence 1 DICOM +(3010,002C) SQ SegmentAnnotationTypeCodeSequence 1 DICOM +(3010,002D) LO DeviceLabel 1 DICOM +(3010,002E) SQ DeviceTypeCodeSequence 1 DICOM +(3010,0030) SQ PatientEquipmentRelationshipCodeSequence 1 DICOM +(3010,0031) UI ReferencedFiducialsUID 1 DICOM +(3010,0032) SQ PatientTreatmentOrientationSequence 1 DICOM +(3010,0033) SH UserContentLabel 1 DICOM +(3010,0034) LO UserContentLongLabel 1 DICOM +(3010,0035) SH EntityLabel 1 DICOM +(3010,0036) LO EntityName 1 DICOM +(3010,0037) ST EntityDescription 1 DICOM +(3010,0038) LO EntityLongLabel 1 DICOM +(3010,0039) US DeviceIndex 1 DICOM +(3010,003A) US RTTreatmentPhaseIndex 1 DICOM +(3010,003B) UI RTTreatmentPhaseUID 1 DICOM +(3010,003C) US RTPrescriptionIndex 1 DICOM +(3010,003D) US RTSegmentAnnotationIndex 1 DICOM +(3010,003E) US BasisRTTreatmentPhaseIndex 1 DICOM +(3010,003F) US RelatedRTTreatmentPhaseIndex 1 DICOM +(3010,0040) US ReferencedRTTreatmentPhaseIndex 1 DICOM +(3010,0041) US ReferencedRTPrescriptionIndex 1 DICOM +(3010,0042) US ReferencedParentRTPrescriptionIndex 1 DICOM +(3010,0043) ST ManufacturerDeviceIdentifier 1 DICOM +(3010,0044) SQ InstanceLevelReferencedPerformedProcedureStepSequence 1 DICOM +(3010,0045) CS RTTreatmentPhaseIntentPresenceFlag 1 DICOM +(3010,0046) CS RadiotherapyTreatmentType 1 DICOM +(3010,0047) CS TeletherapyRadiationType 1-n DICOM +(3010,0048) CS BrachytherapySourceType 1-n DICOM +(3010,0049) SQ ReferencedRTTreatmentPhaseSequence 1 DICOM +(3010,004A) SQ ReferencedDirectSegmentInstanceSequence 1 DICOM +(3010,004B) SQ IntendedRTTreatmentPhaseSequence 1 DICOM +(3010,004C) DA IntendedPhaseStartDate 1 DICOM +(3010,004D) DA IntendedPhaseEndDate 1 DICOM +(3010,004E) SQ RTTreatmentPhaseIntervalSequence 1 DICOM +(3010,004F) CS TemporalRelationshipIntervalAnchor 1 DICOM +(3010,0050) FD MinimumNumberOfIntervalDays 1 DICOM +(3010,0051) FD MaximumNumberOfIntervalDays 1 DICOM +(3010,0052) UI PertinentSOPClassesInStudy 1-n DICOM +(3010,0053) UI PertinentSOPClassesInSeries 1-n DICOM +(3010,0054) LO RTPrescriptionLabel 1 DICOM +(3010,0055) SQ RTPhysicianIntentPredecessorSequence 1 DICOM +(3010,0056) LO RTTreatmentApproachLabel 1 DICOM +(3010,0057) SQ RTPhysicianIntentSequence 1 DICOM +(3010,0058) US RTPhysicianIntentIndex 1 DICOM +(3010,0059) CS RTTreatmentIntentType 1 DICOM +(3010,005A) UT RTPhysicianIntentNarrative 1 DICOM +(3010,005B) SQ RTProtocolCodeSequence 1 DICOM +(3010,005C) ST ReasonForSuperseding 1 DICOM +(3010,005D) SQ RTDiagnosisCodeSequence 1 DICOM +(3010,005E) US ReferencedRTPhysicianIntentIndex 1 DICOM +(3010,005F) SQ RTPhysicianIntentInputInstanceSequence 1 DICOM +(3010,0060) SQ RTAnatomicPrescriptionSequence 1 DICOM +(3010,0061) UT PriorTreatmentDoseDescription 1 DICOM +(3010,0062) SQ PriorTreatmentReferenceSequence 1 DICOM +(3010,0063) CS DosimetricObjectiveEvaluationScope 1 DICOM +(3010,0064) SQ TherapeuticRoleCategoryCodeSequence 1 DICOM +(3010,0065) SQ TherapeuticRoleTypeCodeSequence 1 DICOM +(3010,0066) US ConceptualVolumeOptimizationPrecedence 1 DICOM +(3010,0067) SQ ConceptualVolumeCategoryCodeSequence 1 DICOM +(3010,0068) CS ConceptualVolumeBlockingConstraint 1 DICOM +(3010,0069) SQ ConceptualVolumeTypeCodeSequence 1 DICOM +(3010,006A) SQ ConceptualVolumeTypeModifierCodeSequence 1 DICOM +(3010,006B) SQ RTPrescriptionSequence 1 DICOM +(3010,006C) SQ DosimetricObjectiveSequence 1 DICOM +(3010,006D) SQ DosimetricObjectiveTypeCodeSequence 1 DICOM +(3010,006E) UI DosimetricObjectiveUID 1 DICOM +(3010,006F) UI ReferencedDosimetricObjectiveUID 1 DICOM +(3010,0070) SQ DosimetricObjectiveParameterSequence 1 DICOM +(3010,0071) SQ ReferencedDosimetricObjectivesSequence 1 DICOM +(3010,0073) CS AbsoluteDosimetricObjectiveFlag 1 DICOM +(3010,0074) FD DosimetricObjectiveWeight 1 DICOM +(3010,0075) CS DosimetricObjectivePurpose 1 DICOM +(3010,0076) SQ PlanningInputInformationSequence 1 DICOM +(3010,0077) LO TreatmentSite 1 DICOM +(3010,0078) SQ TreatmentSiteCodeSequence 1 DICOM +(3010,0079) SQ FractionPatternSequence 1 DICOM +(3010,007A) UT TreatmentTechniqueNotes 1 DICOM +(3010,007B) UT PrescriptionNotes 1 DICOM +(3010,007C) IS NumberOfIntervalFractions 1 DICOM +(3010,007D) US NumberOfFractions 1 DICOM +(3010,007E) US IntendedDeliveryDuration 1 DICOM +(3010,007F) UT FractionationNotes 1 DICOM +(3010,0080) SQ RTTreatmentTechniqueCodeSequence 1 DICOM +(3010,0081) SQ PrescriptionNotesSequence 1 DICOM +(3010,0082) SQ FractionBasedRelationshipSequence 1 DICOM +(3010,0083) CS FractionBasedRelationshipIntervalAnchor 1 DICOM +(3010,0084) FD MinimumHoursBetweenFractions 1 DICOM +(3010,0085) TM IntendedFractionStartTime 1-n DICOM +(3010,0086) LT IntendedStartDayOfWeek 1 DICOM +(3010,0087) SQ WeekdayFractionPatternSequence 1 DICOM +(3010,0088) SQ DeliveryTimeStructureCodeSequence 1 DICOM (4010,0001) CS LowEnergyDetectors 1 DICOM/DICOS (4010,0002) CS HighEnergyDetectors 1 DICOM/DICOS (4010,0004) SQ DetectorGeometrySequence 1 DICOM/DICOS @@ -3908,6 +4209,8 @@ (6000-60FF,1303) DS ROIStandardDeviation 1 DICOM (6000-60FF,1500) LO OverlayLabel 1 DICOM (6000-60FF,3000) ox OverlayData 1 DICOM +(7FE0,0001) OV ExtendedOffsetTable 1 DICOM +(7FE0,0002) OV ExtendedOffsetTableLengths 1 DICOM (7FE0,0008) OF FloatPixelData 1 DICOM (7FE0,0009) OD DoubleFloatPixelData 1 DICOM (7FE0,0010) ox PixelData 1 DICOM @@ -4194,6 +4497,7 @@ (0040,A110) DA RETIRED_DateOfDocumentOrVerbalTransactionTrial 1 DICOM/retired (0040,A112) TM RETIRED_TimeOfDocumentCreationOrVerbalTransactionTrial 1 DICOM/retired (0040,A125) CS RETIRED_ReportStatusIDTrial 2 DICOM/retired +(0040,A136) US RETIRED_ReferencedFrameNumbers 1-n DICOM/retired (0040,A167) SQ RETIRED_ObservationCategoryCodeSequenceTrial 1 DICOM/retired (0040,A16A) ST RETIRED_BibliographicCitationTrial 1 DICOM/retired (0040,A172) UI RETIRED_ReferencedObservationUIDTrial 1 DICOM/retired @@ -4392,52 +4696,158 @@ # #--------------------------------------------------------------------------- # -# Supplement 188 (Multi-energy CT Images) +# Supplement 175 (Second Generation Radiotherapy - C-Arm RT Treatment Modalities) # -(0018,9361) CS MultienergyCTAcquisition 1 DICOM/Supplement_188 -(0018,9362) SQ MultienergyCTAcquisitionSequence 1 DICOM/Supplement_188 -(0018,9363) SQ MultienergyCTProcessingSequence 1 DICOM/Supplement_188 -(0018,9364) SQ MultienergyCTCharacteristicsSequence 1 DICOM/Supplement_188 -(0018,9365) SQ MultienergyCTXRaySourceSequence 1 DICOM/Supplement_188 -(0018,9366) US XRaySourceIndex 1 DICOM/Supplement_188 -(0018,9367) UC XRaySourceID 1 DICOM/Supplement_188 -(0018,9368) CS MultienergySourceTechnique 1 DICOM/Supplement_188 -(0018,9369) DT SourceStartDateTime 1 DICOM/Supplement_188 -(0018,936A) DT SourceEndDateTime 1 DICOM/Supplement_188 -(0018,936B) US SwitchingPhaseNumber 1 DICOM/Supplement_188 -(0018,936C) DS SwitchingPhaseNominalDuration 1 DICOM/Supplement_188 -(0018,936D) DS SwitchingPhaseTransitionDuration 1 DICOM/Supplement_188 -(0018,936E) DS EffectiveBinEnergy 1 DICOM/Supplement_188 -(0018,936F) SQ MultienergyCTXRayDetectorSequence 1 DICOM/Supplement_188 -(0018,9370) US XRayDetectorIndex 1 DICOM/Supplement_188 -(0018,9371) UC XRayDetectorID 1 DICOM/Supplement_188 -(0018,9372) CS MultienergyDetectorType 1 DICOM/Supplement_188 -(0018,9373) ST XRayDetectorLabel 1 DICOM/Supplement_188 -(0018,9374) DS NominalMaxEnergy 1 DICOM/Supplement_188 -(0018,9375) DS NominalMinEnergy 1 DICOM/Supplement_188 -(0018,9376) US ReferencedXRayDetectorIndex 1-n DICOM/Supplement_188 -(0018,9377) US ReferencedXRaySourceIndex 1-n DICOM/Supplement_188 -(0018,9378) US ReferencedPathIndex 1-n DICOM/Supplement_188 -(0018,9379) SQ MultienergyCTPathSequence 1 DICOM/Supplement_188 -(0018,937A) US MultienergyCTPathIndex 1 DICOM/Supplement_188 -(0018,937B) UT MultienergyAcquisitionDescription 1 DICOM/Supplement_188 -(0018,937C) FD MonoenergeticEnergyEquivalent 1 DICOM/Supplement_188 -(0018,937D) SQ MaterialCodeSequence 1 DICOM/Supplement_188 -(0018,937E) CS DecompositionMethod 1 DICOM/Supplement_188 -(0018,937F) UT DecompositionDescription 1 DICOM/Supplement_188 -(0018,9380) SQ DecompositionAlgorithmIdentificationSequence 1 DICOM/Supplement_188 -(0018,9381) SQ DecompositionMaterialSequence 1 DICOM/Supplement_188 -(0018,9382) SQ MaterialAttenuationSequence 1 DICOM/Supplement_188 -(0018,9383) DS PhotonEnergy 1 DICOM/Supplement_188 -(0018,9384) DS XRayMassAttenuationCoefficient 1 DICOM/Supplement_188 -# -#--------------------------------------------------------------------------- -# -# Correction Items 1803, 1809 -# -(0022,1036) SQ SourceOfCornealSizeDataCodeSequence 1 DICOM/CP_1803 -(0046,0047) SQ CornealSizeSequence 1 DICOM/CP_1803 -(0008,1041) SQ InstitutionalDepartmentTypeCodeSequence 1 DICOM/CP_1809 +(0018,100B) UI ManufacturerDeviceClassUID 1-n DICOM/Supplement_175 +(0018,1630) CS OutlineShapeType 1 DICOM/Supplement_175 +(0018,1631) FD OutlineLeftVerticalEdge 1 DICOM/Supplement_175 +(0018,1632) FD OutlineRightVerticalEdge 1 DICOM/Supplement_175 +(0018,1633) FD OutlineUpperHorizontalEdge 1 DICOM/Supplement_175 +(0018,1634) FD OutlineLowerHorizontalEdge 1 DICOM/Supplement_175 +(0018,1635) FD CenterOfCircularOutline 2 DICOM/Supplement_175 +(0018,1636) FD DiameterOfCircularOutline 1 DICOM/Supplement_175 +(0018,1637) UL NumberOfPolygonalVertices 1 DICOM/Supplement_175 +(0018,1638) OF VerticesOfThePolygonalOutline 1 DICOM/Supplement_175 +(3006,00C9) SQ PatientLocationCoordinatesSequence 1 DICOM/Supplement_175 +(3006,00CA) SQ PatientLocationCoordinatesCodeSequence 1 DICOM/Supplement_175 +(3006,00CB) SQ PatientSupportPositionSequence 1 DICOM/Supplement_175 +(300A,0600) US RTControlPointIndex 1 DICOM/Supplement_175 +(300A,0601) US RadiationGenerationModeIndex 1 DICOM/Supplement_175 +(300A,0602) US ReferencedDefinedDeviceIndex 1 DICOM/Supplement_175 +(300A,0603) US RadiationDoseIdentificationIndex 1 DICOM/Supplement_175 +(300A,0604) US NumberOfRTControlPoints 1 DICOM/Supplement_175 +(300A,0605) US ReferencedRadiationGenerationModeIndex 1 DICOM/Supplement_175 +(300A,0606) US TreatmentPositionIndex 1 DICOM/Supplement_175 +(300A,0607) US ReferencedDeviceIndex 1 DICOM/Supplement_175 +(300A,0608) LO TreatmentPositionGroupLabel 1 DICOM/Supplement_175 +(300A,0609) UI TreatmentPositionGroupUID 1 DICOM/Supplement_175 +(300A,060A) SQ TreatmentPositionGroupSequence 1 DICOM/Supplement_175 +(300A,060B) US ReferencedTreatmentPositionIndex 1 DICOM/Supplement_175 +(300A,060C) US ReferencedRadiationDoseIdentificationIndex 1 DICOM/Supplement_175 +(300A,060D) FD RTAccessoryHolderWaterEquivalentThickness 1 DICOM/Supplement_175 +(300A,060E) US ReferencedRTAccessoryHolderDeviceIndex 1 DICOM/Supplement_175 +(300A,060F) CS RTAccessoryHolderSlotExistenceFlag 1 DICOM/Supplement_175 +(300A,0610) SQ RTAccessoryHolderSlotSequence 1 DICOM/Supplement_175 +(300A,0611) LO RTAccessoryHolderSlotID 1 DICOM/Supplement_175 +(300A,0612) FD RTAccessoryHolderSlotDistance 1 DICOM/Supplement_175 +(300A,0613) FD RTAccessorySlotDistance 1 DICOM/Supplement_175 +(300A,0614) SQ RTAccessoryHolderDefinitionSequence 1 DICOM/Supplement_175 +(300A,0615) LO RTAccessoryDeviceSlotID 1 DICOM/Supplement_175 +(300A,0616) SQ RTRadiationSequence 1 DICOM/Supplement_175 +(300A,0617) SQ RadiationDoseSequence 1 DICOM/Supplement_175 +(300A,0618) SQ RadiationDoseIdentificationSequence 1 DICOM/Supplement_175 +(300A,0619) LO RadiationDoseIdentificationLabel 1 DICOM/Supplement_175 +(300A,061A) CS ReferenceDoseType 1 DICOM/Supplement_175 +(300A,061B) CS PrimaryDoseValueIndicator 1 DICOM/Supplement_175 +(300A,061C) SQ DoseValuesSequence 1 DICOM/Supplement_175 +(300A,061D) CS DoseValuePurpose 1-n DICOM/Supplement_175 +(300A,061E) FD ReferenceDosePointCoordinates 3 DICOM/Supplement_175 +(300A,061F) SQ RadiationDoseValuesParametersSequence 1 DICOM/Supplement_175 +(300A,0620) SQ MetersetToDoseMappingSequence 1 DICOM/Supplement_175 +(300A,0621) SQ ExpectedInVivoMeasurementValuesSequence 1 DICOM/Supplement_175 +(300A,0622) US ExpectedInVivoMeasurementValueIndex 1 DICOM/Supplement_175 +(300A,0623) LO RadiationDoseInVivoMeasurementLabel 1 DICOM/Supplement_175 +(300A,0624) FD RadiationDoseCentralAxisDisplacement 2 DICOM/Supplement_175 +(300A,0625) FD RadiationDoseValue 1 DICOM/Supplement_175 +(300A,0626) FD RadiationDoseSourceToSkinDistance 1 DICOM/Supplement_175 +(300A,0627) FD RadiationDoseMeasurementPointCoordinates 3 DICOM/Supplement_175 +(300A,0628) FD RadiationDoseSourceToExternalContourDistance 1 DICOM/Supplement_175 +(300A,0629) SQ RTToleranceSetSequence 1 DICOM/Supplement_175 +(300A,062A) LO RTToleranceSetLabel 1 DICOM/Supplement_175 +(300A,062B) SQ AttributeToleranceValuesSequence 1 DICOM/Supplement_175 +(300A,062C) FD ToleranceValue 1 DICOM/Supplement_175 +(300A,062D) SQ PatientSupportPositionToleranceSequence 1 DICOM/Supplement_175 +(300A,062E) FD TreatmentTimeLimit 1 DICOM/Supplement_175 +(300A,062F) SQ CArmPhotonElectronControlPointSequence 1 DICOM/Supplement_175 +(300A,0630) SQ ReferencedRTRadiationSequence 1 DICOM/Supplement_175 +(300A,0631) SQ ReferencedRTInstanceSequence 1 DICOM/Supplement_175 +(300A,0632) SQ ReferencedRTPatientSetupSequence 1 DICOM/Supplement_175 +(300A,0634) FD SourceToPatientSurfaceDistance 1 DICOM/Supplement_175 +(300A,0635) SQ TreatmentMachineSpecialModeCodeSequence 1 DICOM/Supplement_175 +(300A,0636) US IntendedNumberOfFractions 1 DICOM/Supplement_175 +(300A,0637) CS RTRadiationSetIntent 1 DICOM/Supplement_175 +(300A,0638) CS RTRadiationPhysicalAndGeometricContentDetailFlag 1 DICOM/Supplement_175 +(300A,0639) CS RTRecordFlag 1 DICOM/Supplement_175 +(300A,063A) SQ TreatmentDeviceIdentificationSequence 1 DICOM/Supplement_175 +(300A,063B) SQ ReferencedRTPhysicianIntentSequence 1 DICOM/Supplement_175 +(300A,063C) FD CumulativeMeterset 1 DICOM/Supplement_175 +(300A,063D) FD DeliveryRate 1 DICOM/Supplement_175 +(300A,063E) SQ DeliveryRateUnitSequence 1 DICOM/Supplement_175 +(300A,063F) SQ TreatmentPositionSequence 1 DICOM/Supplement_175 +(300A,0640) FD RadiationSourceAxisDistance 1 DICOM/Supplement_175 +(300A,0641) US NumberOfRTBeamLimitingDevices 1 DICOM/Supplement_175 +(300A,0642) FD RTBeamLimitingDeviceProximalDistance 1 DICOM/Supplement_175 +(300A,0643) FD RTBeamLimitingDeviceDistalDistance 1 DICOM/Supplement_175 +(300A,0644) SQ ParallelRTBeamDelimiterDeviceOrientationLabelCodeSequence 1 DICOM/Supplement_175 +(300A,0645) FD BeamsModifierOrientationAngle 1 DICOM/Supplement_175 +(300A,0646) SQ FixedRTBeamDelimiterDeviceSequence 1 DICOM/Supplement_175 +(300A,0647) SQ ParallelRTBeamDelimiterDeviceSequence 1 DICOM/Supplement_175 +(300A,0648) US NumberOfParallelRTBeamDelimiters 1 DICOM/Supplement_175 +(300A,0649) FD ParallelRTBeamDelimiterBoundaries 2-n DICOM/Supplement_175 +(300A,064A) FD ParallelRTBeamDelimiterPositions 2-n DICOM/Supplement_175 +(300A,064B) FD RTBeamLimitingDeviceOffset 2 DICOM/Supplement_175 +(300A,064C) SQ RTBeamDelimiterGeometrySequence 1 DICOM/Supplement_175 +(300A,064D) SQ RTBeamLimitingDeviceDefinitionSequence 1 DICOM/Supplement_175 +(300A,064E) CS ParallelRTBeamDelimiterOpeningMode 1 DICOM/Supplement_175 +(300A,064F) CS ParallelRTBeamDelimiterLeafMountingSide 1-n DICOM/Supplement_175 +(300A,0650) UI PatientSetupUID 1 DICOM/Supplement_175 +(300A,0651) SQ WedgeDefinitionSequence 1 DICOM/Supplement_175 +(300A,0652) FD RadiationBeamWedgeAngle 1 DICOM/Supplement_175 +(300A,0653) FD RadiationBeamWedgeThinEdgeDistance 1 DICOM/Supplement_175 +(300A,0654) FD RadiationBeamEffectiveWedgeAngle 1 DICOM/Supplement_175 +(300A,0655) US NumberOfWedgePositions 1 DICOM/Supplement_175 +(300A,0656) SQ RTBeamLimitingDeviceOpeningSequence 1 DICOM/Supplement_175 +(300A,0657) US NumberOfRTBeamLimitingDeviceOpenings 1 DICOM/Supplement_175 +(300A,0658) SQ RadiationDosimeterUnitSequence 1 DICOM/Supplement_175 +(300A,0659) SQ RTDeviceDistanceReferenceLocationCodeSequence 1 DICOM/Supplement_175 +(300A,065A) SQ RadiationDeviceConfigurationAndCommissioningKeySequence 1 DICOM/Supplement_175 +(300A,065B) SQ PatientSupportPositionParameterSequence 1 DICOM/Supplement_175 +(300A,065C) CS PatientSupportPositionSpecificationMethod 1 DICOM/Supplement_175 +(300A,065D) SQ PatientSupportPositionDeviceParameterSequence 1 DICOM/Supplement_175 +(300A,065E) US DeviceOrderIndex 1 DICOM/Supplement_175 +(300A,065F) US PatientSupportPositionParameterOrderIndex 1 DICOM/Supplement_175 +(300A,0660) SQ PatientSupportPositionDeviceToleranceSequence 1 DICOM/Supplement_175 +(300A,0661) US PatientSupportPositionToleranceOrderIndex 1 DICOM/Supplement_175 +(300A,0662) SQ CompensatorDefinitionSequence 1 DICOM/Supplement_175 +(300A,0663) CS CompensatorMapOrientation 1 DICOM/Supplement_175 +(300A,0664) OF CompensatorProximalThicknessMap 1 DICOM/Supplement_175 +(300A,0665) OF CompensatorDistalThicknessMap 1 DICOM/Supplement_175 +(300A,0666) FD CompensatorBasePlaneOffset 1 DICOM/Supplement_175 +(300A,0667) SQ CompensatorShapeFabricationCodeSequence 1 DICOM/Supplement_175 +(300A,0668) SQ CompensatorShapeSequence 1 DICOM/Supplement_175 +(300A,0669) FD RadiationBeamCompensatorMillingToolDiameter 1 DICOM/Supplement_175 +(300A,066A) SQ BlockDefinitionSequence 1 DICOM/Supplement_175 +(300A,066B) OF BlockEdgeData 1 DICOM/Supplement_175 +(300A,066C) CS BlockOrientation 1 DICOM/Supplement_175 +(300A,066D) FD RadiationBeamBlockThickness 1 DICOM/Supplement_175 +(300A,066E) FD RadiationBeamBlockSlabThickness 1 DICOM/Supplement_175 +(300A,066F) SQ BlockEdgeDataSequence 1 DICOM/Supplement_175 +(300A,0670) US NumberOfRTAccessoryHolders 1 DICOM/Supplement_175 +(300A,0671) SQ GeneralAccessoryDefinitionSequence 1 DICOM/Supplement_175 +(300A,0672) US NumberOfGeneralAccessories 1 DICOM/Supplement_175 +(300A,0673) SQ BolusDefinitionSequence 1 DICOM/Supplement_175 +(300A,0674) US NumberOfBoluses 1 DICOM/Supplement_175 +(300A,0675) UI EquipmentFrameOfReferenceUID 1 DICOM/Supplement_175 +(300A,0676) ST EquipmentFrameOfReferenceDescription 1 DICOM/Supplement_175 +(300A,0677) SQ EquipmentReferencePointCoordinatesSequence 1 DICOM/Supplement_175 +(300A,0678) SQ EquipmentReferencePointCodeSequence 1 DICOM/Supplement_175 +(300A,0679) FD RTBeamLimitingDeviceAngle 1 DICOM/Supplement_175 +(300A,067A) FD SourceRollAngle 1 DICOM/Supplement_175 +(300A,067B) SQ RadiationGenerationModeSequence 1 DICOM/Supplement_175 +(300A,067C) SH RadiationGenerationModeLabel 1 DICOM/Supplement_175 +(300A,067D) ST RadiationGenerationModeDescription 1 DICOM/Supplement_175 +(300A,067E) SQ RadiationGenerationModeMachineCodeSequence 1 DICOM/Supplement_175 +(300A,067F) SQ RadiationTypeCodeSequence 1 DICOM/Supplement_175 +(300A,0680) DS NominalEnergy 1 DICOM/Supplement_175 +(300A,0681) DS MinimumNominalEnergy 1 DICOM/Supplement_175 +(300A,0682) DS MaximumNominalEnergy 1 DICOM/Supplement_175 +(300A,0683) SQ RadiationFluenceModifierCodeSequence 1 DICOM/Supplement_175 +(300A,0684) SQ EnergyUnitCodeSequence 1 DICOM/Supplement_175 +(300A,0685) US NumberOfRadiationGenerationModes 1 DICOM/Supplement_175 +(300A,0686) SQ PatientSupportDevicesSequence 1 DICOM/Supplement_175 +(300A,0687) US NumberOfPatientSupportDevices 1 DICOM/Supplement_175 +(300A,0688) FD RTBeamModifierDefinitionDistance 1 DICOM/Supplement_175 +(300A,0689) SQ BeamAreaLimitSequence 1 DICOM/Supplement_175 # #--------------------------------------------------------------------------- # diff --git a/dcmdata/data/private.dic b/dcmdata/data/private.dic index 880753fa..b754dc78 100644 --- a/dcmdata/data/private.dic +++ b/dcmdata/data/private.dic @@ -469,29 +469,29 @@ (0019,"GEMS_ACQU_01",a3) UL CalibratedFieldStrength 1 PrivateTag (0019,"GEMS_ACQU_01",a4) SS SATFatWaterBone 1 PrivateTag (0019,"GEMS_ACQU_01",a5) DS ReceiveBandwidth 1 PrivateTag -(0019,"GEMS_ACQU_01",a7) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",a8) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",a9) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",aa) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",ab) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",ac) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",ad) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",ae) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",af) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b0) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b1) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b2) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b3) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b4) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b5) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b6) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b7) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b8) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",b9) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",ba) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",bb) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",bc) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",bd) DS UserData 1 PrivateTag +(0019,"GEMS_ACQU_01",a7) DS UserData0 1 PrivateTag +(0019,"GEMS_ACQU_01",a8) DS UserData1 1 PrivateTag +(0019,"GEMS_ACQU_01",a9) DS UserData2 1 PrivateTag +(0019,"GEMS_ACQU_01",aa) DS UserData3 1 PrivateTag +(0019,"GEMS_ACQU_01",ab) DS UserData4 1 PrivateTag +(0019,"GEMS_ACQU_01",ac) DS UserData5 1 PrivateTag +(0019,"GEMS_ACQU_01",ad) DS UserData6 1 PrivateTag +(0019,"GEMS_ACQU_01",ae) DS UserData7 1 PrivateTag +(0019,"GEMS_ACQU_01",af) DS UserData8 1 PrivateTag +(0019,"GEMS_ACQU_01",b0) DS UserData9 1 PrivateTag +(0019,"GEMS_ACQU_01",b1) DS UserData10 1 PrivateTag +(0019,"GEMS_ACQU_01",b2) DS UserData11 1 PrivateTag +(0019,"GEMS_ACQU_01",b3) DS UserData12 1 PrivateTag +(0019,"GEMS_ACQU_01",b4) DS UserData13 1 PrivateTag +(0019,"GEMS_ACQU_01",b5) DS UserData14 1 PrivateTag +(0019,"GEMS_ACQU_01",b6) DS UserData15 1 PrivateTag +(0019,"GEMS_ACQU_01",b7) DS UserData16 1 PrivateTag +(0019,"GEMS_ACQU_01",b8) DS UserData17 1 PrivateTag +(0019,"GEMS_ACQU_01",b9) DS UserData18 1 PrivateTag +(0019,"GEMS_ACQU_01",ba) DS UserData19 1 PrivateTag +(0019,"GEMS_ACQU_01",bb) DS UserData20 1 PrivateTag +(0019,"GEMS_ACQU_01",bc) DS UserData21 1 PrivateTag +(0019,"GEMS_ACQU_01",bd) DS UserData22 1 PrivateTag (0019,"GEMS_ACQU_01",be) DS ProjectionAngle 1 PrivateTag (0019,"GEMS_ACQU_01",c0) SS SaturationPlanes 1 PrivateTag (0019,"GEMS_ACQU_01",c1) SS SurfaceCoilIntensityCorrectionFlag 1 PrivateTag @@ -523,8 +523,8 @@ (0019,"GEMS_ACQU_01",dc) SS PrimarySpeedCorrectionUsed 1 PrivateTag (0019,"GEMS_ACQU_01",dd) SS OverrangeCorrectionUsed 1 PrivateTag (0019,"GEMS_ACQU_01",de) DS DynamicZAlphaValue 1 PrivateTag -(0019,"GEMS_ACQU_01",df) DS UserData 1 PrivateTag -(0019,"GEMS_ACQU_01",e0) DS UserData 1 PrivateTag +(0019,"GEMS_ACQU_01",df) DS UserData23 1 PrivateTag +(0019,"GEMS_ACQU_01",e0) DS UserData24 1 PrivateTag (0019,"GEMS_ACQU_01",e1) DS Unknown 1 PrivateTag (0019,"GEMS_ACQU_01",e2) DS VelocityEncodeScale 1 PrivateTag (0019,"GEMS_ACQU_01",e3) LT Unknown 1 PrivateTag diff --git a/dcmdata/docs/dcm2xml.man b/dcmdata/docs/dcm2xml.man index 6910e833..f2e58ec8 100644 --- a/dcmdata/docs/dcm2xml.man +++ b/dcmdata/docs/dcm2xml.man @@ -236,14 +236,14 @@ default. They can be identified by the additional attribute "loaded" with a value of "no" (see example above). The command line option \e --load-all forces to load all value fields including the very long ones. -Furthermore, binary information of OB and OW attributes are not written to the -XML output file by default. These elements can be identified by the -additional attribute "binary" with a value of "hidden" (default is "no"). The -command line option \e --write-binary-data causes also binary value fields to -be printed (attribute value is "yes" or "base64"). But, be careful when using -this option together with \e --load-all because of the large amounts of pixel -data that might be printed to the output. Please note that in this context -element values with a VR of OD or OF are not regarded as "binary information". +Furthermore, binary data of OB and OW attributes are not written to the XML +output file by default. These elements can be identified by the additional +attribute "binary" with a value of "hidden" (default is "no"). The command line +option \e --write-binary-data causes also binary value fields to be printed +(attribute value is "yes" or "base64"). But, be careful when using this option +together with \e --load-all because of the large amounts of pixel data that +might be printed to the output. Please note that in this context element values +with a VR of OD, OF, OL and OV are not regarded as "binary data". Multiple values (i.e. where the DICOM value multiplicity is greater than 1) are separated by a backslash "\" (except for Base64 encoded data). The "len" @@ -261,8 +261,8 @@ standard, part 19 ("Application Hosting"). \subsection dcm2xml_bulk_data Bulk Data Binary data, i.e. DICOM element values with Value Representations (VR) of OB -or OW, as well as OD, OF and UN values are by default not written to the XML -output because of their size. Instead, for each element, a new Universally +or OW, as well as OD, OF, OV and UN values are by default not written to the +XML output because of their size. Instead, for each element, a new Universally Unique Identifier (UUID) is being generated and written as an attribute of a \ XML element. So far, there is no possibility to write an additional file to hold the binary data for each of the binary data chunks. @@ -273,15 +273,15 @@ available in future versions of \b dcm2xml. In addition, Supplement 163 (Store Over the Web by Representational State Transfer Services) introduces a new \ XML element that allows for encoding binary data as Base64. Currently, the command line option -\e --encode-base64 enables this encoding for the following VRs: OB, OD, OF, OW, -and UN. +\e --encode-base64 enables this encoding for the following VRs: OB, OD, OF, OV, +OW and UN. \subsection dcm2xml_known_issues Known Issues In addition to what is written in the above section on "Bulk Data", there are further known issues with the current implementation of the Native DICOM Model -format. For example, large element values with a VR other than OB, OD, OF, OW -or UN are currently never written as bulk data, although it might be useful, +format. For example, large element values with a VR other than OB, OD, OF, OV, +OW or UN are currently never written as bulk data, although it might be useful, e.g. for very long text elements (especially UT) or very long numeric fields (of various VRs). @@ -319,6 +319,11 @@ data set to UTF-8 encoding prior to the conversion to XML format. This is also useful for DICOMDIR files where each directory record can have a different character set. +If no mapping is defined and option \e --convert-to-utf8 is not used, non-ASCII +characters and those below #32 are stored as "&#nnn;" where "nnn" refers to the +numeric character code. This might lead to invalid character entity references +(such as "" for ESC) and will cause most XML parsers to reject the document. + \section dcm2xml_logging LOGGING The level of logging output of the various command line tools and underlying @@ -386,6 +391,6 @@ It is an error if no data dictionary can be loaded. \section dcm2xml_copyright COPYRIGHT -Copyright (C) 2002-2016 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2002-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmdata/docs/img2dcm.man b/dcmdata/docs/img2dcm.man index dbae2638..4c84e104 100644 --- a/dcmdata/docs/img2dcm.man +++ b/dcmdata/docs/img2dcm.man @@ -22,6 +22,11 @@ for the resulting DICOM object. \b img2dcm can also be configured to invent missing DICOM type 1 and type 2 attributes to work even without any template dataset. +\b img2dcm only supports single-frame output so far, i.e. it is not possible to +create multi-frame objects. Thus, also output SOP Classes that potentially +allow multiple frames within one object (such as the new Secondary Capture SOP +Classes) can only be created containing a single frame. + \section img2dcm_parameters PARAMETERS \verbatim imgfile-in image file to be imported @@ -491,6 +496,6 @@ images \section img2dcm_copyright COPYRIGHT -Copyright (C) 2007-2016 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2007-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmdata/docs/xml2dcm.man b/dcmdata/docs/xml2dcm.man index a65e4477..02fea6cd 100644 --- a/dcmdata/docs/xml2dcm.man +++ b/dcmdata/docs/xml2dcm.man @@ -240,8 +240,8 @@ See \b dcm2xml documentation for more details on the XML structure. \subsection xml2dcm_binary_data Binary Data -Binary data can be encoded either as a sequence of hex numbers separated by a -backslash "\" or in Base64 format (binary="base64"). In addition, binary data +Binary data (*) can be encoded either as a sequence of hex numbers separated by +a backslash "\" or in Base64 format (binary="base64"). In addition, binary data can also be read from file (binary="file"). In this case, the filename has to be specified as the element value, e.g. @@ -254,6 +254,10 @@ expected to be little endian ordered and will be swapped if necessary. No checks will be made to ensure that the amount of data is reasonable in terms of other attributes such as Rows or Columns. +(*) Please note that currently only OB and OW data is supported, i.e. element +values with a VR of OD, OF, OL and OV are not regarded as "binary data" and +treated as all other VRs. + \subsection xml2dcm_compression Compression If libxml is compiled with zlib support, the input file (\e xmlfile-in) can @@ -338,6 +342,6 @@ It is an error if no data dictionary can be loaded. \section xml2dcm_copyright COPYRIGHT -Copyright (C) 2003-2014 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2003-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmdata/include/dcmtk/dcmdata/dcbytstr.h b/dcmdata/include/dcmtk/dcmdata/dcbytstr.h index 653eabd1..ca28195a 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcbytstr.h +++ b/dcmdata/include/dcmtk/dcmdata/dcbytstr.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -63,7 +63,6 @@ class DCMTK_DCMDATA_EXPORT DcmByteString: public DcmElement /** constructor. * Create new element from given tag. * @param tag DICOM tag for the new element - * @param len value length for the new element */ DcmByteString(const DcmTag &tag); @@ -171,7 +170,7 @@ class DCMTK_DCMDATA_EXPORT DcmByteString: public DcmElement * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcddirif.h b/dcmdata/include/dcmtk/dcmdata/dcddirif.h index 61b6ba41..7db20e5d 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcddirif.h +++ b/dcmdata/include/dcmtk/dcmdata/dcddirif.h @@ -1104,6 +1104,18 @@ class DCMTK_DCMDATA_EXPORT DicomDirInterface const OFString &referencedFileID, const OFFilename &sourceFilename); + /** create or update radiotherapy record and copy required values from dataset + * @param record record to be updated, use NULL to create a new one + * @param fileformat DICOM dataset of the current file + * @param referencedFileID value of the Referenced File ID attribute + * @param sourceFilename name of the source DICOM file + * @return pointer to new or updated record, NULL if an error occurred + */ + DcmDirectoryRecord *buildRadiotherapyRecord(DcmDirectoryRecord *record, + DcmFileFormat *fileformat, + const OFString &referencedFileID, + const OFFilename &sourceFilename); + /** create or update image record and copy required values from dataset * @param record record to be updated, use NULL to create a new one * @param fileformat DICOM dataset of the current file diff --git a/dcmdata/include/dcmtk/dcmdata/dcdeftag.h b/dcmdata/include/dcmtk/dcmdata/dcdeftag.h index 48170f1f..11751552 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcdeftag.h +++ b/dcmdata/include/dcmtk/dcmdata/dcdeftag.h @@ -4,7 +4,7 @@ ** ** User: joergr ** Host: thinkpad -** Date: 2018-11-15 17:07:40 +** Date: 2019-08-07 18:58:15 ** Prog: /home/joergr/Source/dcmtk-full/public/dcmdata/libsrc/mkdeftag ** ** From: ../data/dicom.dic @@ -17,12 +17,12 @@ #include "dcmtk/dcmdata/dctagkey.h" -#define DCM_DICT_DEFTAG_BUILD_DATE "2018-11-15 17:07:40" +#define DCM_DICT_DEFTAG_BUILD_DATE "2019-08-07 18:58:15" /* ** Fixed Tags in ascending (gggg,eeee) order. -** Number of entries: 4306 +** Number of entries: 4722 ** Tags with a repeating component (repeating tags) are listed later. */ #define DCM_CommandGroupLength DcmTagKey(0x0000, 0x0000) @@ -609,6 +609,111 @@ #define DCM_WedgeChamferHeight DcmTagKey(0x0014, 0x511d) #define DCM_WedgeCurve DcmTagKey(0x0014, 0x511e) #define DCM_RadiusAlongWedge DcmTagKey(0x0014, 0x511f) +#define DCM_WhitePoint DcmTagKey(0x0016, 0x0001) +#define DCM_PrimaryChromaticities DcmTagKey(0x0016, 0x0002) +#define DCM_BatteryLevel DcmTagKey(0x0016, 0x0003) +#define DCM_ExposureTimeInSeconds DcmTagKey(0x0016, 0x0004) +#define DCM_FNumber DcmTagKey(0x0016, 0x0005) +#define DCM_OECFRows DcmTagKey(0x0016, 0x0006) +#define DCM_OECFColumns DcmTagKey(0x0016, 0x0007) +#define DCM_OECFColumnNames DcmTagKey(0x0016, 0x0008) +#define DCM_OECFValues DcmTagKey(0x0016, 0x0009) +#define DCM_SpatialFrequencyResponseRows DcmTagKey(0x0016, 0x000a) +#define DCM_SpatialFrequencyResponseColumns DcmTagKey(0x0016, 0x000b) +#define DCM_SpatialFrequencyResponseColumnNames DcmTagKey(0x0016, 0x000c) +#define DCM_SpatialFrequencyResponseValues DcmTagKey(0x0016, 0x000d) +#define DCM_ColorFilterArrayPatternRows DcmTagKey(0x0016, 0x000e) +#define DCM_ColorFilterArrayPatternColumns DcmTagKey(0x0016, 0x000f) +#define DCM_ColorFilterArrayPatternValues DcmTagKey(0x0016, 0x0010) +#define DCM_FlashFiringStatus DcmTagKey(0x0016, 0x0011) +#define DCM_FlashReturnStatus DcmTagKey(0x0016, 0x0012) +#define DCM_FlashMode DcmTagKey(0x0016, 0x0013) +#define DCM_FlashFunctionPresent DcmTagKey(0x0016, 0x0014) +#define DCM_FlashRedEyeMode DcmTagKey(0x0016, 0x0015) +#define DCM_ExposureProgram DcmTagKey(0x0016, 0x0016) +#define DCM_SpectralSensitivity DcmTagKey(0x0016, 0x0017) +#define DCM_PhotographicSensitivity DcmTagKey(0x0016, 0x0018) +#define DCM_SelfTimerMode DcmTagKey(0x0016, 0x0019) +#define DCM_SensitivityType DcmTagKey(0x0016, 0x001a) +#define DCM_StandardOutputSensitivity DcmTagKey(0x0016, 0x001b) +#define DCM_RecommendedExposureIndex DcmTagKey(0x0016, 0x001c) +#define DCM_ISOSpeed DcmTagKey(0x0016, 0x001d) +#define DCM_ISOSpeedLatitudeyyy DcmTagKey(0x0016, 0x001e) +#define DCM_ISOSpeedLatitudezzz DcmTagKey(0x0016, 0x001f) +#define DCM_EXIFVersion DcmTagKey(0x0016, 0x0020) +#define DCM_ShutterSpeedValue DcmTagKey(0x0016, 0x0021) +#define DCM_ApertureValue DcmTagKey(0x0016, 0x0022) +#define DCM_BrightnessValue DcmTagKey(0x0016, 0x0023) +#define DCM_ExposureBiasValue DcmTagKey(0x0016, 0x0024) +#define DCM_MaxApertureValue DcmTagKey(0x0016, 0x0025) +#define DCM_SubjectDistance DcmTagKey(0x0016, 0x0026) +#define DCM_MeteringMode DcmTagKey(0x0016, 0x0027) +#define DCM_LightSource DcmTagKey(0x0016, 0x0028) +#define DCM_FocalLength DcmTagKey(0x0016, 0x0029) +#define DCM_SubjectArea DcmTagKey(0x0016, 0x002a) +#define DCM_MakerNote DcmTagKey(0x0016, 0x002b) +#define DCM_Temperature DcmTagKey(0x0016, 0x0030) +#define DCM_Humidity DcmTagKey(0x0016, 0x0031) +#define DCM_Pressure DcmTagKey(0x0016, 0x0032) +#define DCM_WaterDepth DcmTagKey(0x0016, 0x0033) +#define DCM_Acceleration DcmTagKey(0x0016, 0x0034) +#define DCM_CameraElevationAngle DcmTagKey(0x0016, 0x0035) +#define DCM_FlashEnergy DcmTagKey(0x0016, 0x0036) +#define DCM_SubjectLocation DcmTagKey(0x0016, 0x0037) +#define DCM_PhotographicExposureIndex DcmTagKey(0x0016, 0x0038) +#define DCM_SensingMethod DcmTagKey(0x0016, 0x0039) +#define DCM_FileSource DcmTagKey(0x0016, 0x003a) +#define DCM_SceneType DcmTagKey(0x0016, 0x003b) +#define DCM_CustomRendered DcmTagKey(0x0016, 0x0041) +#define DCM_ExposureMode DcmTagKey(0x0016, 0x0042) +#define DCM_WhiteBalance DcmTagKey(0x0016, 0x0043) +#define DCM_DigitalZoomRatio DcmTagKey(0x0016, 0x0044) +#define DCM_FocalLengthIn35mmFilm DcmTagKey(0x0016, 0x0045) +#define DCM_SceneCaptureType DcmTagKey(0x0016, 0x0046) +#define DCM_GainControl DcmTagKey(0x0016, 0x0047) +#define DCM_Contrast DcmTagKey(0x0016, 0x0048) +#define DCM_Saturation DcmTagKey(0x0016, 0x0049) +#define DCM_Sharpness DcmTagKey(0x0016, 0x004a) +#define DCM_DeviceSettingDescription DcmTagKey(0x0016, 0x004b) +#define DCM_SubjectDistanceRange DcmTagKey(0x0016, 0x004c) +#define DCM_CameraOwnerName DcmTagKey(0x0016, 0x004d) +#define DCM_LensSpecification DcmTagKey(0x0016, 0x004e) +#define DCM_LensMake DcmTagKey(0x0016, 0x004f) +#define DCM_LensModel DcmTagKey(0x0016, 0x0050) +#define DCM_LensSerialNumber DcmTagKey(0x0016, 0x0051) +#define DCM_InteroperabilityIndex DcmTagKey(0x0016, 0x0061) +#define DCM_InteroperabilityVersion DcmTagKey(0x0016, 0x0062) +#define DCM_GPSVersionID DcmTagKey(0x0016, 0x0070) +#define DCM_GPSLatitudeRef DcmTagKey(0x0016, 0x0071) +#define DCM_GPSLatitude DcmTagKey(0x0016, 0x0072) +#define DCM_GPSLongitudeRef DcmTagKey(0x0016, 0x0073) +#define DCM_GPSLongitude DcmTagKey(0x0016, 0x0074) +#define DCM_GPSAltitudeRef DcmTagKey(0x0016, 0x0075) +#define DCM_GPSAltitude DcmTagKey(0x0016, 0x0076) +#define DCM_GPSTimeStamp DcmTagKey(0x0016, 0x0077) +#define DCM_GPSSatellites DcmTagKey(0x0016, 0x0078) +#define DCM_GPSStatus DcmTagKey(0x0016, 0x0079) +#define DCM_GPSMeasureMode DcmTagKey(0x0016, 0x007a) +#define DCM_GPSDOP DcmTagKey(0x0016, 0x007b) +#define DCM_GPSSpeedRef DcmTagKey(0x0016, 0x007c) +#define DCM_GPSSpeed DcmTagKey(0x0016, 0x007d) +#define DCM_GPSTrackRef DcmTagKey(0x0016, 0x007e) +#define DCM_GPSTrack DcmTagKey(0x0016, 0x007f) +#define DCM_GPSImgDirectionRef DcmTagKey(0x0016, 0x0080) +#define DCM_GPSImgDirection DcmTagKey(0x0016, 0x0081) +#define DCM_GPSMapDatum DcmTagKey(0x0016, 0x0082) +#define DCM_GPSDestLatitudeRef DcmTagKey(0x0016, 0x0083) +#define DCM_GPSDestLatitude DcmTagKey(0x0016, 0x0084) +#define DCM_GPSDestLongitudeRef DcmTagKey(0x0016, 0x0085) +#define DCM_GPSDestLongitude DcmTagKey(0x0016, 0x0086) +#define DCM_GPSDestBearingRef DcmTagKey(0x0016, 0x0087) +#define DCM_GPSDestBearing DcmTagKey(0x0016, 0x0088) +#define DCM_GPSDestDistanceRef DcmTagKey(0x0016, 0x0089) +#define DCM_GPSDestDistance DcmTagKey(0x0016, 0x008a) +#define DCM_GPSProcessingMethod DcmTagKey(0x0016, 0x008b) +#define DCM_GPSAreaInformation DcmTagKey(0x0016, 0x008c) +#define DCM_GPSDateStamp DcmTagKey(0x0016, 0x008d) +#define DCM_GPSDifferential DcmTagKey(0x0016, 0x008e) #define DCM_ContrastBolusAgent DcmTagKey(0x0018, 0x0010) #define DCM_ContrastBolusAgentSequence DcmTagKey(0x0018, 0x0012) #define DCM_ContrastBolusT1Relaxivity DcmTagKey(0x0018, 0x0013) @@ -671,6 +776,7 @@ #define DCM_GantryID DcmTagKey(0x0018, 0x1008) #define DCM_UniqueDeviceIdentifier DcmTagKey(0x0018, 0x1009) #define DCM_UDISequence DcmTagKey(0x0018, 0x100a) +#define DCM_ManufacturerDeviceClassUID DcmTagKey(0x0018, 0x100b) #define DCM_SecondaryCaptureDeviceID DcmTagKey(0x0018, 0x1010) #define DCM_RETIRED_HardcopyCreationDeviceID DcmTagKey(0x0018, 0x1011) #define DCM_DateOfSecondaryCapture DcmTagKey(0x0018, 0x1012) @@ -838,6 +944,15 @@ #define DCM_ShutterPresentationValue DcmTagKey(0x0018, 0x1622) #define DCM_ShutterOverlayGroup DcmTagKey(0x0018, 0x1623) #define DCM_ShutterPresentationColorCIELabValue DcmTagKey(0x0018, 0x1624) +#define DCM_OutlineShapeType DcmTagKey(0x0018, 0x1630) +#define DCM_OutlineLeftVerticalEdge DcmTagKey(0x0018, 0x1631) +#define DCM_OutlineRightVerticalEdge DcmTagKey(0x0018, 0x1632) +#define DCM_OutlineUpperHorizontalEdge DcmTagKey(0x0018, 0x1633) +#define DCM_OutlineLowerHorizontalEdge DcmTagKey(0x0018, 0x1634) +#define DCM_CenterOfCircularOutline DcmTagKey(0x0018, 0x1635) +#define DCM_DiameterOfCircularOutline DcmTagKey(0x0018, 0x1636) +#define DCM_NumberOfPolygonalVertices DcmTagKey(0x0018, 0x1637) +#define DCM_VerticesOfThePolygonalOutline DcmTagKey(0x0018, 0x1638) #define DCM_CollimatorShape DcmTagKey(0x0018, 0x1700) #define DCM_CollimatorLeftVerticalEdge DcmTagKey(0x0018, 0x1702) #define DCM_CollimatorRightVerticalEdge DcmTagKey(0x0018, 0x1704) @@ -1638,6 +1753,13 @@ #define DCM_RefractiveProcedureOccurred DcmTagKey(0x0022, 0x1039) #define DCM_RefractiveSurgeryTypeCodeSequence DcmTagKey(0x0022, 0x1040) #define DCM_OphthalmicUltrasoundMethodCodeSequence DcmTagKey(0x0022, 0x1044) +#define DCM_SurgicallyInducedAstigmatismSequence DcmTagKey(0x0022, 0x1045) +#define DCM_TypeOfOpticalCorrection DcmTagKey(0x0022, 0x1046) +#define DCM_ToricIOLPowerSequence DcmTagKey(0x0022, 0x1047) +#define DCM_PredictedToricErrorSequence DcmTagKey(0x0022, 0x1048) +#define DCM_PreSelectedForImplantation DcmTagKey(0x0022, 0x1049) +#define DCM_ToricIOLPowerForExactEmmetropiaSequence DcmTagKey(0x0022, 0x104a) +#define DCM_ToricIOLPowerForExactTargetRefractionSequence DcmTagKey(0x0022, 0x104b) #define DCM_OphthalmicAxialLengthMeasurementsSequence DcmTagKey(0x0022, 0x1050) #define DCM_IOLPower DcmTagKey(0x0022, 0x1053) #define DCM_PredictedRefractiveError DcmTagKey(0x0022, 0x1054) @@ -1659,6 +1781,9 @@ #define DCM_AnteriorChamberDepthDefinitionCodeSequence DcmTagKey(0x0022, 0x1125) #define DCM_LensThicknessSequence DcmTagKey(0x0022, 0x1127) #define DCM_AnteriorChamberDepthSequence DcmTagKey(0x0022, 0x1128) +#define DCM_CalculationCommentSequence DcmTagKey(0x0022, 0x112a) +#define DCM_CalculationCommentType DcmTagKey(0x0022, 0x112b) +#define DCM_CalculationComment DcmTagKey(0x0022, 0x112c) #define DCM_LensThickness DcmTagKey(0x0022, 0x1130) #define DCM_AnteriorChamberDepth DcmTagKey(0x0022, 0x1131) #define DCM_SourceOfLensThicknessDataCodeSequence DcmTagKey(0x0022, 0x1132) @@ -2107,6 +2232,8 @@ #define DCM_RETIRED_StudyComponentStatusID DcmTagKey(0x0032, 0x1055) #define DCM_RequestedProcedureDescription DcmTagKey(0x0032, 0x1060) #define DCM_RequestedProcedureCodeSequence DcmTagKey(0x0032, 0x1064) +#define DCM_ReasonForVisit DcmTagKey(0x0032, 0x1066) +#define DCM_ReasonForVisitCodeSequence DcmTagKey(0x0032, 0x1067) #define DCM_RequestedContrastAgent DcmTagKey(0x0032, 0x1070) #define DCM_RETIRED_StudyComments DcmTagKey(0x0032, 0x4000) #define DCM_ReferencedPatientAliasSequence DcmTagKey(0x0038, 0x0004) @@ -2413,7 +2540,7 @@ #define DCM_RETIRED_ReportStatusIDTrial DcmTagKey(0x0040, 0xa125) #define DCM_TemporalRangeType DcmTagKey(0x0040, 0xa130) #define DCM_ReferencedSamplePositions DcmTagKey(0x0040, 0xa132) -#define DCM_ReferencedFrameNumbers DcmTagKey(0x0040, 0xa136) +#define DCM_RETIRED_ReferencedFrameNumbers DcmTagKey(0x0040, 0xa136) #define DCM_ReferencedTimeOffsets DcmTagKey(0x0040, 0xa138) #define DCM_ReferencedDateTime DcmTagKey(0x0040, 0xa13a) #define DCM_TextValue DcmTagKey(0x0040, 0xa160) @@ -2501,6 +2628,7 @@ #define DCM_MIMETypeOfEncapsulatedDocument DcmTagKey(0x0042, 0x0012) #define DCM_SourceInstanceSequence DcmTagKey(0x0042, 0x0013) #define DCM_ListOfMIMETypes DcmTagKey(0x0042, 0x0014) +#define DCM_EncapsulatedDocumentLength DcmTagKey(0x0042, 0x0015) #define DCM_ProductPackageIdentifier DcmTagKey(0x0044, 0x0001) #define DCM_SubstanceAdministrationApproval DcmTagKey(0x0044, 0x0002) #define DCM_ApprovalStatusFurtherDescription DcmTagKey(0x0044, 0x0003) @@ -2565,6 +2693,15 @@ #define DCM_AddOtherSequence DcmTagKey(0x0046, 0x0102) #define DCM_AddPower DcmTagKey(0x0046, 0x0104) #define DCM_ViewingDistance DcmTagKey(0x0046, 0x0106) +#define DCM_CorneaMeasurementsSequence DcmTagKey(0x0046, 0x0110) +#define DCM_SourceOfCorneaMeasurementDataCodeSequence DcmTagKey(0x0046, 0x0111) +#define DCM_SteepCornealAxisSequence DcmTagKey(0x0046, 0x0112) +#define DCM_FlatCornealAxisSequence DcmTagKey(0x0046, 0x0113) +#define DCM_CornealPower DcmTagKey(0x0046, 0x0114) +#define DCM_CornealAxis DcmTagKey(0x0046, 0x0115) +#define DCM_CorneaMeasurementMethodCodeSequence DcmTagKey(0x0046, 0x0116) +#define DCM_RefractiveIndexOfCornea DcmTagKey(0x0046, 0x0117) +#define DCM_RefractiveIndexOfAqueousHumor DcmTagKey(0x0046, 0x0118) #define DCM_VisualAcuityTypeCodeSequence DcmTagKey(0x0046, 0x0121) #define DCM_VisualAcuityRightEyeSequence DcmTagKey(0x0046, 0x0122) #define DCM_VisualAcuityLeftEyeSequence DcmTagKey(0x0046, 0x0123) @@ -2655,6 +2792,7 @@ #define DCM_ContainerComponentDiameter DcmTagKey(0x0050, 0x001d) #define DCM_ContainerComponentDescription DcmTagKey(0x0050, 0x001e) #define DCM_DeviceDescription DcmTagKey(0x0050, 0x0020) +#define DCM_LongDeviceDescription DcmTagKey(0x0050, 0x0021) #define DCM_ContrastBolusIngredientPercentByVolume DcmTagKey(0x0052, 0x0001) #define DCM_OCTFocalDistance DcmTagKey(0x0052, 0x0002) #define DCM_BeamSpotSize DcmTagKey(0x0052, 0x0003) @@ -3428,6 +3566,8 @@ #define DCM_EncryptedContentTransferSyntaxUID DcmTagKey(0x0400, 0x0510) #define DCM_EncryptedContent DcmTagKey(0x0400, 0x0520) #define DCM_ModifiedAttributesSequence DcmTagKey(0x0400, 0x0550) +#define DCM_NonconformingModifiedAttributesSequence DcmTagKey(0x0400, 0x0551) +#define DCM_NonconformingDataElementValue DcmTagKey(0x0400, 0x0552) #define DCM_OriginalAttributesSequence DcmTagKey(0x0400, 0x0561) #define DCM_AttributeModificationDateTime DcmTagKey(0x0400, 0x0562) #define DCM_ModifyingSystem DcmTagKey(0x0400, 0x0563) @@ -3659,6 +3799,9 @@ #define DCM_RETIRED_FrameOfReferenceTransformationType DcmTagKey(0x3006, 0x00c4) #define DCM_FrameOfReferenceTransformationMatrix DcmTagKey(0x3006, 0x00c6) #define DCM_FrameOfReferenceTransformationComment DcmTagKey(0x3006, 0x00c8) +#define DCM_PatientLocationCoordinatesSequence DcmTagKey(0x3006, 0x00c9) +#define DCM_PatientLocationCoordinatesCodeSequence DcmTagKey(0x3006, 0x00ca) +#define DCM_PatientSupportPositionSequence DcmTagKey(0x3006, 0x00cb) #define DCM_MeasuredDoseReferenceSequence DcmTagKey(0x3008, 0x0010) #define DCM_MeasuredDoseDescription DcmTagKey(0x3008, 0x0012) #define DCM_MeasuredDoseType DcmTagKey(0x3008, 0x0014) @@ -4154,6 +4297,143 @@ #define DCM_DeliveredNominalRangeModulatedRegionDepths DcmTagKey(0x300a, 0x0510) #define DCM_DeliveredReferenceDoseDefinition DcmTagKey(0x300a, 0x0511) #define DCM_ReferenceDoseDefinition DcmTagKey(0x300a, 0x0512) +#define DCM_RTControlPointIndex DcmTagKey(0x300a, 0x0600) +#define DCM_RadiationGenerationModeIndex DcmTagKey(0x300a, 0x0601) +#define DCM_ReferencedDefinedDeviceIndex DcmTagKey(0x300a, 0x0602) +#define DCM_RadiationDoseIdentificationIndex DcmTagKey(0x300a, 0x0603) +#define DCM_NumberOfRTControlPoints DcmTagKey(0x300a, 0x0604) +#define DCM_ReferencedRadiationGenerationModeIndex DcmTagKey(0x300a, 0x0605) +#define DCM_TreatmentPositionIndex DcmTagKey(0x300a, 0x0606) +#define DCM_ReferencedDeviceIndex DcmTagKey(0x300a, 0x0607) +#define DCM_TreatmentPositionGroupLabel DcmTagKey(0x300a, 0x0608) +#define DCM_TreatmentPositionGroupUID DcmTagKey(0x300a, 0x0609) +#define DCM_TreatmentPositionGroupSequence DcmTagKey(0x300a, 0x060a) +#define DCM_ReferencedTreatmentPositionIndex DcmTagKey(0x300a, 0x060b) +#define DCM_ReferencedRadiationDoseIdentificationIndex DcmTagKey(0x300a, 0x060c) +#define DCM_RTAccessoryHolderWaterEquivalentThickness DcmTagKey(0x300a, 0x060d) +#define DCM_ReferencedRTAccessoryHolderDeviceIndex DcmTagKey(0x300a, 0x060e) +#define DCM_RTAccessoryHolderSlotExistenceFlag DcmTagKey(0x300a, 0x060f) +#define DCM_RTAccessoryHolderSlotSequence DcmTagKey(0x300a, 0x0610) +#define DCM_RTAccessoryHolderSlotID DcmTagKey(0x300a, 0x0611) +#define DCM_RTAccessoryHolderSlotDistance DcmTagKey(0x300a, 0x0612) +#define DCM_RTAccessorySlotDistance DcmTagKey(0x300a, 0x0613) +#define DCM_RTAccessoryHolderDefinitionSequence DcmTagKey(0x300a, 0x0614) +#define DCM_RTAccessoryDeviceSlotID DcmTagKey(0x300a, 0x0615) +#define DCM_RTRadiationSequence DcmTagKey(0x300a, 0x0616) +#define DCM_RadiationDoseSequence DcmTagKey(0x300a, 0x0617) +#define DCM_RadiationDoseIdentificationSequence DcmTagKey(0x300a, 0x0618) +#define DCM_RadiationDoseIdentificationLabel DcmTagKey(0x300a, 0x0619) +#define DCM_ReferenceDoseType DcmTagKey(0x300a, 0x061a) +#define DCM_PrimaryDoseValueIndicator DcmTagKey(0x300a, 0x061b) +#define DCM_DoseValuesSequence DcmTagKey(0x300a, 0x061c) +#define DCM_DoseValuePurpose DcmTagKey(0x300a, 0x061d) +#define DCM_ReferenceDosePointCoordinates DcmTagKey(0x300a, 0x061e) +#define DCM_RadiationDoseValuesParametersSequence DcmTagKey(0x300a, 0x061f) +#define DCM_MetersetToDoseMappingSequence DcmTagKey(0x300a, 0x0620) +#define DCM_ExpectedInVivoMeasurementValuesSequence DcmTagKey(0x300a, 0x0621) +#define DCM_ExpectedInVivoMeasurementValueIndex DcmTagKey(0x300a, 0x0622) +#define DCM_RadiationDoseInVivoMeasurementLabel DcmTagKey(0x300a, 0x0623) +#define DCM_RadiationDoseCentralAxisDisplacement DcmTagKey(0x300a, 0x0624) +#define DCM_RadiationDoseValue DcmTagKey(0x300a, 0x0625) +#define DCM_RadiationDoseSourceToSkinDistance DcmTagKey(0x300a, 0x0626) +#define DCM_RadiationDoseMeasurementPointCoordinates DcmTagKey(0x300a, 0x0627) +#define DCM_RadiationDoseSourceToExternalContourDistance DcmTagKey(0x300a, 0x0628) +#define DCM_RTToleranceSetSequence DcmTagKey(0x300a, 0x0629) +#define DCM_RTToleranceSetLabel DcmTagKey(0x300a, 0x062a) +#define DCM_AttributeToleranceValuesSequence DcmTagKey(0x300a, 0x062b) +#define DCM_ToleranceValue DcmTagKey(0x300a, 0x062c) +#define DCM_PatientSupportPositionToleranceSequence DcmTagKey(0x300a, 0x062d) +#define DCM_TreatmentTimeLimit DcmTagKey(0x300a, 0x062e) +#define DCM_CArmPhotonElectronControlPointSequence DcmTagKey(0x300a, 0x062f) +#define DCM_ReferencedRTRadiationSequence DcmTagKey(0x300a, 0x0630) +#define DCM_ReferencedRTInstanceSequence DcmTagKey(0x300a, 0x0631) +#define DCM_ReferencedRTPatientSetupSequence DcmTagKey(0x300a, 0x0632) +#define DCM_SourceToPatientSurfaceDistance DcmTagKey(0x300a, 0x0634) +#define DCM_TreatmentMachineSpecialModeCodeSequence DcmTagKey(0x300a, 0x0635) +#define DCM_IntendedNumberOfFractions DcmTagKey(0x300a, 0x0636) +#define DCM_RTRadiationSetIntent DcmTagKey(0x300a, 0x0637) +#define DCM_RTRadiationPhysicalAndGeometricContentDetailFlag DcmTagKey(0x300a, 0x0638) +#define DCM_RTRecordFlag DcmTagKey(0x300a, 0x0639) +#define DCM_TreatmentDeviceIdentificationSequence DcmTagKey(0x300a, 0x063a) +#define DCM_ReferencedRTPhysicianIntentSequence DcmTagKey(0x300a, 0x063b) +#define DCM_CumulativeMeterset DcmTagKey(0x300a, 0x063c) +#define DCM_DeliveryRate DcmTagKey(0x300a, 0x063d) +#define DCM_DeliveryRateUnitSequence DcmTagKey(0x300a, 0x063e) +#define DCM_TreatmentPositionSequence DcmTagKey(0x300a, 0x063f) +#define DCM_RadiationSourceAxisDistance DcmTagKey(0x300a, 0x0640) +#define DCM_NumberOfRTBeamLimitingDevices DcmTagKey(0x300a, 0x0641) +#define DCM_RTBeamLimitingDeviceProximalDistance DcmTagKey(0x300a, 0x0642) +#define DCM_RTBeamLimitingDeviceDistalDistance DcmTagKey(0x300a, 0x0643) +#define DCM_ParallelRTBeamDelimiterDeviceOrientationLabelCodeSequence DcmTagKey(0x300a, 0x0644) +#define DCM_BeamsModifierOrientationAngle DcmTagKey(0x300a, 0x0645) +#define DCM_FixedRTBeamDelimiterDeviceSequence DcmTagKey(0x300a, 0x0646) +#define DCM_ParallelRTBeamDelimiterDeviceSequence DcmTagKey(0x300a, 0x0647) +#define DCM_NumberOfParallelRTBeamDelimiters DcmTagKey(0x300a, 0x0648) +#define DCM_ParallelRTBeamDelimiterBoundaries DcmTagKey(0x300a, 0x0649) +#define DCM_ParallelRTBeamDelimiterPositions DcmTagKey(0x300a, 0x064a) +#define DCM_RTBeamLimitingDeviceOffset DcmTagKey(0x300a, 0x064b) +#define DCM_RTBeamDelimiterGeometrySequence DcmTagKey(0x300a, 0x064c) +#define DCM_RTBeamLimitingDeviceDefinitionSequence DcmTagKey(0x300a, 0x064d) +#define DCM_ParallelRTBeamDelimiterOpeningMode DcmTagKey(0x300a, 0x064e) +#define DCM_ParallelRTBeamDelimiterLeafMountingSide DcmTagKey(0x300a, 0x064f) +#define DCM_PatientSetupUID DcmTagKey(0x300a, 0x0650) +#define DCM_WedgeDefinitionSequence DcmTagKey(0x300a, 0x0651) +#define DCM_RadiationBeamWedgeAngle DcmTagKey(0x300a, 0x0652) +#define DCM_RadiationBeamWedgeThinEdgeDistance DcmTagKey(0x300a, 0x0653) +#define DCM_RadiationBeamEffectiveWedgeAngle DcmTagKey(0x300a, 0x0654) +#define DCM_NumberOfWedgePositions DcmTagKey(0x300a, 0x0655) +#define DCM_RTBeamLimitingDeviceOpeningSequence DcmTagKey(0x300a, 0x0656) +#define DCM_NumberOfRTBeamLimitingDeviceOpenings DcmTagKey(0x300a, 0x0657) +#define DCM_RadiationDosimeterUnitSequence DcmTagKey(0x300a, 0x0658) +#define DCM_RTDeviceDistanceReferenceLocationCodeSequence DcmTagKey(0x300a, 0x0659) +#define DCM_RadiationDeviceConfigurationAndCommissioningKeySequence DcmTagKey(0x300a, 0x065a) +#define DCM_PatientSupportPositionParameterSequence DcmTagKey(0x300a, 0x065b) +#define DCM_PatientSupportPositionSpecificationMethod DcmTagKey(0x300a, 0x065c) +#define DCM_PatientSupportPositionDeviceParameterSequence DcmTagKey(0x300a, 0x065d) +#define DCM_DeviceOrderIndex DcmTagKey(0x300a, 0x065e) +#define DCM_PatientSupportPositionParameterOrderIndex DcmTagKey(0x300a, 0x065f) +#define DCM_PatientSupportPositionDeviceToleranceSequence DcmTagKey(0x300a, 0x0660) +#define DCM_PatientSupportPositionToleranceOrderIndex DcmTagKey(0x300a, 0x0661) +#define DCM_CompensatorDefinitionSequence DcmTagKey(0x300a, 0x0662) +#define DCM_CompensatorMapOrientation DcmTagKey(0x300a, 0x0663) +#define DCM_CompensatorProximalThicknessMap DcmTagKey(0x300a, 0x0664) +#define DCM_CompensatorDistalThicknessMap DcmTagKey(0x300a, 0x0665) +#define DCM_CompensatorBasePlaneOffset DcmTagKey(0x300a, 0x0666) +#define DCM_CompensatorShapeFabricationCodeSequence DcmTagKey(0x300a, 0x0667) +#define DCM_CompensatorShapeSequence DcmTagKey(0x300a, 0x0668) +#define DCM_RadiationBeamCompensatorMillingToolDiameter DcmTagKey(0x300a, 0x0669) +#define DCM_BlockDefinitionSequence DcmTagKey(0x300a, 0x066a) +#define DCM_BlockEdgeData DcmTagKey(0x300a, 0x066b) +#define DCM_BlockOrientation DcmTagKey(0x300a, 0x066c) +#define DCM_RadiationBeamBlockThickness DcmTagKey(0x300a, 0x066d) +#define DCM_RadiationBeamBlockSlabThickness DcmTagKey(0x300a, 0x066e) +#define DCM_BlockEdgeDataSequence DcmTagKey(0x300a, 0x066f) +#define DCM_NumberOfRTAccessoryHolders DcmTagKey(0x300a, 0x0670) +#define DCM_GeneralAccessoryDefinitionSequence DcmTagKey(0x300a, 0x0671) +#define DCM_NumberOfGeneralAccessories DcmTagKey(0x300a, 0x0672) +#define DCM_BolusDefinitionSequence DcmTagKey(0x300a, 0x0673) +#define DCM_NumberOfBoluses DcmTagKey(0x300a, 0x0674) +#define DCM_EquipmentFrameOfReferenceUID DcmTagKey(0x300a, 0x0675) +#define DCM_EquipmentFrameOfReferenceDescription DcmTagKey(0x300a, 0x0676) +#define DCM_EquipmentReferencePointCoordinatesSequence DcmTagKey(0x300a, 0x0677) +#define DCM_EquipmentReferencePointCodeSequence DcmTagKey(0x300a, 0x0678) +#define DCM_RTBeamLimitingDeviceAngle DcmTagKey(0x300a, 0x0679) +#define DCM_SourceRollAngle DcmTagKey(0x300a, 0x067a) +#define DCM_RadiationGenerationModeSequence DcmTagKey(0x300a, 0x067b) +#define DCM_RadiationGenerationModeLabel DcmTagKey(0x300a, 0x067c) +#define DCM_RadiationGenerationModeDescription DcmTagKey(0x300a, 0x067d) +#define DCM_RadiationGenerationModeMachineCodeSequence DcmTagKey(0x300a, 0x067e) +#define DCM_RadiationTypeCodeSequence DcmTagKey(0x300a, 0x067f) +#define DCM_NominalEnergy DcmTagKey(0x300a, 0x0680) +#define DCM_MinimumNominalEnergy DcmTagKey(0x300a, 0x0681) +#define DCM_MaximumNominalEnergy DcmTagKey(0x300a, 0x0682) +#define DCM_RadiationFluenceModifierCodeSequence DcmTagKey(0x300a, 0x0683) +#define DCM_EnergyUnitCodeSequence DcmTagKey(0x300a, 0x0684) +#define DCM_NumberOfRadiationGenerationModes DcmTagKey(0x300a, 0x0685) +#define DCM_PatientSupportDevicesSequence DcmTagKey(0x300a, 0x0686) +#define DCM_NumberOfPatientSupportDevices DcmTagKey(0x300a, 0x0687) +#define DCM_RTBeamModifierDefinitionDistance DcmTagKey(0x300a, 0x0688) +#define DCM_BeamAreaLimitSequence DcmTagKey(0x300a, 0x0689) #define DCM_ReferencedRTPlanSequence DcmTagKey(0x300c, 0x0002) #define DCM_ReferencedBeamSequence DcmTagKey(0x300c, 0x0004) #define DCM_ReferencedBeamNumber DcmTagKey(0x300c, 0x0006) @@ -4192,6 +4472,140 @@ #define DCM_ReviewDate DcmTagKey(0x300e, 0x0004) #define DCM_ReviewTime DcmTagKey(0x300e, 0x0005) #define DCM_ReviewerName DcmTagKey(0x300e, 0x0008) +#define DCM_RadiobiologicalDoseEffectSequence DcmTagKey(0x3010, 0x0001) +#define DCM_RadiobiologicalDoseEffectFlag DcmTagKey(0x3010, 0x0002) +#define DCM_EffectiveDoseCalculationMethodCategoryCodeSequence DcmTagKey(0x3010, 0x0003) +#define DCM_EffectiveDoseCalculationMethodCodeSequence DcmTagKey(0x3010, 0x0004) +#define DCM_EffectiveDoseCalculationMethodDescription DcmTagKey(0x3010, 0x0005) +#define DCM_ConceptualVolumeUID DcmTagKey(0x3010, 0x0006) +#define DCM_OriginatingSOPInstanceReferenceSequence DcmTagKey(0x3010, 0x0007) +#define DCM_ConceptualVolumeConstituentSequence DcmTagKey(0x3010, 0x0008) +#define DCM_EquivalentConceptualVolumeInstanceReferenceSequence DcmTagKey(0x3010, 0x0009) +#define DCM_EquivalentConceptualVolumesSequence DcmTagKey(0x3010, 0x000a) +#define DCM_ReferencedConceptualVolumeUID DcmTagKey(0x3010, 0x000b) +#define DCM_ConceptualVolumeCombinationExpression DcmTagKey(0x3010, 0x000c) +#define DCM_ConceptualVolumeConstituentIndex DcmTagKey(0x3010, 0x000d) +#define DCM_ConceptualVolumeCombinationFlag DcmTagKey(0x3010, 0x000e) +#define DCM_ConceptualVolumeCombinationDescription DcmTagKey(0x3010, 0x000f) +#define DCM_ConceptualVolumeSegmentationDefinedFlag DcmTagKey(0x3010, 0x0010) +#define DCM_ConceptualVolumeSegmentationReferenceSequence DcmTagKey(0x3010, 0x0011) +#define DCM_ConceptualVolumeConstituentSegmentationReferenceSequence DcmTagKey(0x3010, 0x0012) +#define DCM_ConstituentConceptualVolumeUID DcmTagKey(0x3010, 0x0013) +#define DCM_DerivationConceptualVolumeSequence DcmTagKey(0x3010, 0x0014) +#define DCM_SourceConceptualVolumeUID DcmTagKey(0x3010, 0x0015) +#define DCM_ConceptualVolumeDerivationAlgorithmSequence DcmTagKey(0x3010, 0x0016) +#define DCM_ConceptualVolumeDescription DcmTagKey(0x3010, 0x0017) +#define DCM_SourceConceptualVolumeSequence DcmTagKey(0x3010, 0x0018) +#define DCM_AuthorIdentificationSequence DcmTagKey(0x3010, 0x0019) +#define DCM_ManufacturerModelVersion DcmTagKey(0x3010, 0x001a) +#define DCM_DeviceAlternateIdentifier DcmTagKey(0x3010, 0x001b) +#define DCM_DeviceAlternateIdentifierType DcmTagKey(0x3010, 0x001c) +#define DCM_DeviceAlternateIdentifierFormat DcmTagKey(0x3010, 0x001d) +#define DCM_SegmentationCreationTemplateLabel DcmTagKey(0x3010, 0x001e) +#define DCM_SegmentationTemplateUID DcmTagKey(0x3010, 0x001f) +#define DCM_ReferencedSegmentReferenceIndex DcmTagKey(0x3010, 0x0020) +#define DCM_SegmentReferenceSequence DcmTagKey(0x3010, 0x0021) +#define DCM_SegmentReferenceIndex DcmTagKey(0x3010, 0x0022) +#define DCM_DirectSegmentReferenceSequence DcmTagKey(0x3010, 0x0023) +#define DCM_CombinationSegmentReferenceSequence DcmTagKey(0x3010, 0x0024) +#define DCM_ConceptualVolumeSequence DcmTagKey(0x3010, 0x0025) +#define DCM_SegmentedRTAccessoryDeviceSequence DcmTagKey(0x3010, 0x0026) +#define DCM_SegmentCharacteristicsSequence DcmTagKey(0x3010, 0x0027) +#define DCM_RelatedSegmentCharacteristicsSequence DcmTagKey(0x3010, 0x0028) +#define DCM_SegmentCharacteristicsPrecedence DcmTagKey(0x3010, 0x0029) +#define DCM_RTSegmentAnnotationSequence DcmTagKey(0x3010, 0x002a) +#define DCM_SegmentAnnotationCategoryCodeSequence DcmTagKey(0x3010, 0x002b) +#define DCM_SegmentAnnotationTypeCodeSequence DcmTagKey(0x3010, 0x002c) +#define DCM_DeviceLabel DcmTagKey(0x3010, 0x002d) +#define DCM_DeviceTypeCodeSequence DcmTagKey(0x3010, 0x002e) +#define DCM_PatientEquipmentRelationshipCodeSequence DcmTagKey(0x3010, 0x0030) +#define DCM_ReferencedFiducialsUID DcmTagKey(0x3010, 0x0031) +#define DCM_PatientTreatmentOrientationSequence DcmTagKey(0x3010, 0x0032) +#define DCM_UserContentLabel DcmTagKey(0x3010, 0x0033) +#define DCM_UserContentLongLabel DcmTagKey(0x3010, 0x0034) +#define DCM_EntityLabel DcmTagKey(0x3010, 0x0035) +#define DCM_EntityName DcmTagKey(0x3010, 0x0036) +#define DCM_EntityDescription DcmTagKey(0x3010, 0x0037) +#define DCM_EntityLongLabel DcmTagKey(0x3010, 0x0038) +#define DCM_DeviceIndex DcmTagKey(0x3010, 0x0039) +#define DCM_RTTreatmentPhaseIndex DcmTagKey(0x3010, 0x003a) +#define DCM_RTTreatmentPhaseUID DcmTagKey(0x3010, 0x003b) +#define DCM_RTPrescriptionIndex DcmTagKey(0x3010, 0x003c) +#define DCM_RTSegmentAnnotationIndex DcmTagKey(0x3010, 0x003d) +#define DCM_BasisRTTreatmentPhaseIndex DcmTagKey(0x3010, 0x003e) +#define DCM_RelatedRTTreatmentPhaseIndex DcmTagKey(0x3010, 0x003f) +#define DCM_ReferencedRTTreatmentPhaseIndex DcmTagKey(0x3010, 0x0040) +#define DCM_ReferencedRTPrescriptionIndex DcmTagKey(0x3010, 0x0041) +#define DCM_ReferencedParentRTPrescriptionIndex DcmTagKey(0x3010, 0x0042) +#define DCM_ManufacturerDeviceIdentifier DcmTagKey(0x3010, 0x0043) +#define DCM_InstanceLevelReferencedPerformedProcedureStepSequence DcmTagKey(0x3010, 0x0044) +#define DCM_RTTreatmentPhaseIntentPresenceFlag DcmTagKey(0x3010, 0x0045) +#define DCM_RadiotherapyTreatmentType DcmTagKey(0x3010, 0x0046) +#define DCM_TeletherapyRadiationType DcmTagKey(0x3010, 0x0047) +#define DCM_BrachytherapySourceType DcmTagKey(0x3010, 0x0048) +#define DCM_ReferencedRTTreatmentPhaseSequence DcmTagKey(0x3010, 0x0049) +#define DCM_ReferencedDirectSegmentInstanceSequence DcmTagKey(0x3010, 0x004a) +#define DCM_IntendedRTTreatmentPhaseSequence DcmTagKey(0x3010, 0x004b) +#define DCM_IntendedPhaseStartDate DcmTagKey(0x3010, 0x004c) +#define DCM_IntendedPhaseEndDate DcmTagKey(0x3010, 0x004d) +#define DCM_RTTreatmentPhaseIntervalSequence DcmTagKey(0x3010, 0x004e) +#define DCM_TemporalRelationshipIntervalAnchor DcmTagKey(0x3010, 0x004f) +#define DCM_MinimumNumberOfIntervalDays DcmTagKey(0x3010, 0x0050) +#define DCM_MaximumNumberOfIntervalDays DcmTagKey(0x3010, 0x0051) +#define DCM_PertinentSOPClassesInStudy DcmTagKey(0x3010, 0x0052) +#define DCM_PertinentSOPClassesInSeries DcmTagKey(0x3010, 0x0053) +#define DCM_RTPrescriptionLabel DcmTagKey(0x3010, 0x0054) +#define DCM_RTPhysicianIntentPredecessorSequence DcmTagKey(0x3010, 0x0055) +#define DCM_RTTreatmentApproachLabel DcmTagKey(0x3010, 0x0056) +#define DCM_RTPhysicianIntentSequence DcmTagKey(0x3010, 0x0057) +#define DCM_RTPhysicianIntentIndex DcmTagKey(0x3010, 0x0058) +#define DCM_RTTreatmentIntentType DcmTagKey(0x3010, 0x0059) +#define DCM_RTPhysicianIntentNarrative DcmTagKey(0x3010, 0x005a) +#define DCM_RTProtocolCodeSequence DcmTagKey(0x3010, 0x005b) +#define DCM_ReasonForSuperseding DcmTagKey(0x3010, 0x005c) +#define DCM_RTDiagnosisCodeSequence DcmTagKey(0x3010, 0x005d) +#define DCM_ReferencedRTPhysicianIntentIndex DcmTagKey(0x3010, 0x005e) +#define DCM_RTPhysicianIntentInputInstanceSequence DcmTagKey(0x3010, 0x005f) +#define DCM_RTAnatomicPrescriptionSequence DcmTagKey(0x3010, 0x0060) +#define DCM_PriorTreatmentDoseDescription DcmTagKey(0x3010, 0x0061) +#define DCM_PriorTreatmentReferenceSequence DcmTagKey(0x3010, 0x0062) +#define DCM_DosimetricObjectiveEvaluationScope DcmTagKey(0x3010, 0x0063) +#define DCM_TherapeuticRoleCategoryCodeSequence DcmTagKey(0x3010, 0x0064) +#define DCM_TherapeuticRoleTypeCodeSequence DcmTagKey(0x3010, 0x0065) +#define DCM_ConceptualVolumeOptimizationPrecedence DcmTagKey(0x3010, 0x0066) +#define DCM_ConceptualVolumeCategoryCodeSequence DcmTagKey(0x3010, 0x0067) +#define DCM_ConceptualVolumeBlockingConstraint DcmTagKey(0x3010, 0x0068) +#define DCM_ConceptualVolumeTypeCodeSequence DcmTagKey(0x3010, 0x0069) +#define DCM_ConceptualVolumeTypeModifierCodeSequence DcmTagKey(0x3010, 0x006a) +#define DCM_RTPrescriptionSequence DcmTagKey(0x3010, 0x006b) +#define DCM_DosimetricObjectiveSequence DcmTagKey(0x3010, 0x006c) +#define DCM_DosimetricObjectiveTypeCodeSequence DcmTagKey(0x3010, 0x006d) +#define DCM_DosimetricObjectiveUID DcmTagKey(0x3010, 0x006e) +#define DCM_ReferencedDosimetricObjectiveUID DcmTagKey(0x3010, 0x006f) +#define DCM_DosimetricObjectiveParameterSequence DcmTagKey(0x3010, 0x0070) +#define DCM_ReferencedDosimetricObjectivesSequence DcmTagKey(0x3010, 0x0071) +#define DCM_AbsoluteDosimetricObjectiveFlag DcmTagKey(0x3010, 0x0073) +#define DCM_DosimetricObjectiveWeight DcmTagKey(0x3010, 0x0074) +#define DCM_DosimetricObjectivePurpose DcmTagKey(0x3010, 0x0075) +#define DCM_PlanningInputInformationSequence DcmTagKey(0x3010, 0x0076) +#define DCM_TreatmentSite DcmTagKey(0x3010, 0x0077) +#define DCM_TreatmentSiteCodeSequence DcmTagKey(0x3010, 0x0078) +#define DCM_FractionPatternSequence DcmTagKey(0x3010, 0x0079) +#define DCM_TreatmentTechniqueNotes DcmTagKey(0x3010, 0x007a) +#define DCM_PrescriptionNotes DcmTagKey(0x3010, 0x007b) +#define DCM_NumberOfIntervalFractions DcmTagKey(0x3010, 0x007c) +#define DCM_NumberOfFractions DcmTagKey(0x3010, 0x007d) +#define DCM_IntendedDeliveryDuration DcmTagKey(0x3010, 0x007e) +#define DCM_FractionationNotes DcmTagKey(0x3010, 0x007f) +#define DCM_RTTreatmentTechniqueCodeSequence DcmTagKey(0x3010, 0x0080) +#define DCM_PrescriptionNotesSequence DcmTagKey(0x3010, 0x0081) +#define DCM_FractionBasedRelationshipSequence DcmTagKey(0x3010, 0x0082) +#define DCM_FractionBasedRelationshipIntervalAnchor DcmTagKey(0x3010, 0x0083) +#define DCM_MinimumHoursBetweenFractions DcmTagKey(0x3010, 0x0084) +#define DCM_IntendedFractionStartTime DcmTagKey(0x3010, 0x0085) +#define DCM_IntendedStartDayOfWeek DcmTagKey(0x3010, 0x0086) +#define DCM_WeekdayFractionPatternSequence DcmTagKey(0x3010, 0x0087) +#define DCM_DeliveryTimeStructureCodeSequence DcmTagKey(0x3010, 0x0088) #define DCM_RETIRED_Arbitrary DcmTagKey(0x4000, 0x0010) #define DCM_RETIRED_TextComments DcmTagKey(0x4000, 0x4000) #define DCM_RETIRED_ResultsID DcmTagKey(0x4008, 0x0040) @@ -4320,6 +4734,8 @@ #define DCM_WaveformData DcmTagKey(0x5400, 0x1010) #define DCM_FirstOrderPhaseCorrectionAngle DcmTagKey(0x5600, 0x0010) #define DCM_SpectroscopyData DcmTagKey(0x5600, 0x0020) +#define DCM_ExtendedOffsetTable DcmTagKey(0x7fe0, 0x0001) +#define DCM_ExtendedOffsetTableLengths DcmTagKey(0x7fe0, 0x0002) #define DCM_FloatPixelData DcmTagKey(0x7fe0, 0x0008) #define DCM_DoubleFloatPixelData DcmTagKey(0x7fe0, 0x0009) #define DCM_PixelData DcmTagKey(0x7fe0, 0x0010) diff --git a/dcmdata/include/dcmtk/dcmdata/dcdicdir.h b/dcmdata/include/dcmtk/dcmdata/dcdicdir.h index f7126019..6e05e956 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcdicdir.h +++ b/dcmdata/include/dcmtk/dcmdata/dcdicdir.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2014, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -73,7 +73,7 @@ public: * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcdirrec.h b/dcmdata/include/dcmtk/dcmdata/dcdirrec.h index 701c036c..89adaa63 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcdirrec.h +++ b/dcmdata/include/dcmtk/dcmdata/dcdirrec.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -126,7 +126,9 @@ typedef enum { /// tractography ERT_Tract = 46, /// assessment - ERT_Assessment = 47 + ERT_Assessment = 47, + /// radiotherapy + ERT_Radiotherapy = 48 } E_DirRecType; @@ -143,7 +145,8 @@ public: /// default constructor DcmDirectoryRecord(); - /** constructor + /** constructor. + * Create new element from given tag and length. * @param tag attribute tag * @param len length of the attribute value */ @@ -286,7 +289,7 @@ public: * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, @@ -305,7 +308,7 @@ public: * @param maxReadLength Maximum read length for reading an attribute value. * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition read(DcmInputStream & inStream, + virtual OFCondition read(DcmInputStream &inStream, const E_TransferSyntax xfer, const E_GrpLenEncoding glenc = EGL_noChange, const Uint32 maxReadLength = DCM_MaxReadLength); @@ -315,7 +318,7 @@ public: * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); diff --git a/dcmdata/include/dcmtk/dcmdata/dcelem.h b/dcmdata/include/dcmtk/dcmdata/dcelem.h index 7bdf6ed7..87b8a5a2 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcelem.h +++ b/dcmdata/include/dcmtk/dcmdata/dcelem.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -304,6 +304,22 @@ class DCMTK_DCMDATA_EXPORT DcmElement */ virtual OFCondition getFloat32(Float32 &val, const unsigned long pos = 0); + /** retrieve a single value of type Sint64. Requires element to be of corresponding VR, + * otherwise an error is returned. + * @param val value returned in this parameter upon success + * @param pos position in multi-valued attribute, default 0 + * @return EC_Normal upon success, an error code otherwise + */ + virtual OFCondition getSint64(Sint64 &val, const unsigned long pos = 0); + + /** retrieve a single value of type Uint64. Requires element to be of corresponding VR, + * otherwise an error is returned. + * @param val value returned in this parameter upon success + * @param pos position in multi-valued attribute, default 0 + * @return EC_Normal upon success, an error code otherwise + */ + virtual OFCondition getUint64(Uint64 &val, const unsigned long pos = 0); + /** retrieve a single value of type Float64. Requires element to be of corresponding VR, * otherwise an error is returned. * @param val value returned in this parameter upon success @@ -425,6 +441,26 @@ class DCMTK_DCMDATA_EXPORT DcmElement */ virtual OFCondition getFloat32Array(Float32 *&val); + /** get a pointer to the element value of the current element as type Sint64. + * Requires element to be of corresponding VR, otherwise an error is returned. + * This method does not copy, but returns a pointer to the element value, + * which remains under control of this object and is valid only until the next + * read, write or put operation. + * @param val pointer to value returned in this parameter upon success + * @return EC_Normal upon success, an error code otherwise + */ + virtual OFCondition getSint64Array(Sint64 *&val); + + /** get a pointer to the element value of the current element as type Uint64. + * Requires element to be of corresponding VR, otherwise an error is returned. + * This method does not copy, but returns a pointer to the element value, + * which remains under control of this object and is valid only until the next + * read, write or put operation. + * @param val pointer to value returned in this parameter upon success + * @return EC_Normal upon success, an error code otherwise + */ + virtual OFCondition getUint64Array(Uint64 *&val); + /** get a pointer to the element value of the current element as type Float64. * Requires element to be of corresponding VR, otherwise an error is returned. * This method does not copy, but returns a pointer to the element value, diff --git a/dcmdata/include/dcmtk/dcmdata/dcencdoc.h b/dcmdata/include/dcmtk/dcmdata/dcencdoc.h index 511d5d2d..4fa7fb30 100755 --- a/dcmdata/include/dcmtk/dcmdata/dcencdoc.h +++ b/dcmdata/include/dcmtk/dcmdata/dcencdoc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2018, OFFIS e.V. + * Copyright (C) 2018-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -21,15 +21,19 @@ #ifndef DCENCDOC_H #define DCENCDOC_H + //make sure OS specific configuration is included first #include "dcmtk/config/osconfig.h" -//for override keys -#include "dcmtk/dcmdata/dcpath.h" -#include "dcmtk/dcmdata/dctk.h" -#include "dcmtk/dcmiod/iodcommn.h" -#include "dcmtk/ofstd/ofconapp.h" -#include "dcmtk/ofstd/ofxml.h" +#include "dcmtk/ofstd/ofstring.h" /* for class OFString */ +#include "dcmtk/ofstd/ofcond.h" /* for class OFCondition */ +#include "dcmtk/dcmdata/dcdefine.h" /* for DCMTK_DCMDATA_EXPORT */ +#include "dcmtk/dcmdata/dcfilefo.h" /* for class DcmFileFormat */ +#include "dcmtk/ofstd/ofcmdln.h" /* for OFCmdUnsignedInt */ +class XMLNode; +class OFCommandLine; +class OFConsoleApplication; +class OFLogger; /** This class handles common functions of all command line applications * for document encapsulation. @@ -150,7 +154,7 @@ public: OFLogger& logger); /** Get study or series data from provided file. Generate UID if none present. - * @param logger The logger of the application calling this method. + * @param appLogger The logger of the application calling this method. * @return EC_Normal if successful, an error code otherwise. */ OFCondition createIdentifiers(OFLogger& appLogger); @@ -211,7 +215,7 @@ public: OFString getFileType(); /** Sets the current filetype. - * @param fName the current filetype. + * @param fType the current filetype. * @return none. */ void setFileType(OFString fType); diff --git a/dcmdata/include/dcmtk/dcmdata/dcerror.h b/dcmdata/include/dcmtk/dcmdata/dcerror.h index 3b1c2833..cb71d1a0 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcerror.h +++ b/dcmdata/include/dcmtk/dcmdata/dcerror.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -71,6 +71,7 @@ const unsigned short OFM_dcmseg = 30; const unsigned short OFM_dcmfg = 31; const unsigned short OFM_dcmtract = 32; const unsigned short OFM_dcmpmap = 33; +const unsigned short OFM_dcmelekt = 34; // condition constants @@ -167,6 +168,8 @@ extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_UndefinedLengthOBOW; extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_VOI_LUT_OBOW; /// Pixel data in top level dataset in compressed Transfer Syntax uses explicit length (undefined required) extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_PixelDataExplLengthIllegal; +/// Element length is larger than 32-bit length field permits +extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_ElemLengthExceeds32BitField; //@} // status code constants diff --git a/dcmdata/include/dcmtk/dcmdata/dcfilefo.h b/dcmdata/include/dcmtk/dcmdata/dcfilefo.h index 1dcbf9a4..c8338364 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcfilefo.h +++ b/dcmdata/include/dcmtk/dcmdata/dcfilefo.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -119,7 +119,7 @@ class DCMTK_DCMDATA_EXPORT DcmFileFormat * @param pixelFileName optional filename used to write the raw pixel data file * @param pixelCounter optional counter used for automatic pixel data filename creation */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcitem.h b/dcmdata/include/dcmtk/dcmdata/dcitem.h index 73ef7ae4..5a4afc4f 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcitem.h +++ b/dcmdata/include/dcmtk/dcmdata/dcitem.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -169,7 +169,7 @@ class DCMTK_DCMDATA_EXPORT DcmItem * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, @@ -290,7 +290,7 @@ class DCMTK_DCMDATA_EXPORT DcmItem * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); /** write object in JSON format @@ -298,7 +298,7 @@ class DCMTK_DCMDATA_EXPORT DcmItem * @param format used to format and customize the output * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeJson(STD_NAMESPACE ostream&out, + virtual OFCondition writeJson(STD_NAMESPACE ostream &out, DcmJsonFormat &format); /** special write method for creation of digital signatures @@ -836,6 +836,62 @@ class DCMTK_DCMDATA_EXPORT DcmItem unsigned long *count = NULL, const OFBool searchIntoSub = OFFalse); + /** find element and get value as an unsigned 64-bit integer. + * Applicable to the following VRs: OV, UV + * The result variable 'value' is automatically set to zero if an error occurs. + * @param tagKey DICOM tag specifying the attribute to be searched for + * @param value variable in which the element value is stored + * @param pos index of the value in case of multi-valued elements (0..vm-1) + * @param searchIntoSub flag indicating whether to search into sequences or not + * @return EC_Normal upon success, an error code otherwise. + */ + OFCondition findAndGetUint64(const DcmTagKey &tagKey, + Uint64 &value, + const unsigned long pos = 0, + const OFBool searchIntoSub = OFFalse); + + /** find element and get value as an array of unsigned 64-bit integers. + * Applicable to the following VRs: OV, UV + * The result variable 'value' is automatically set to NULL if an error occurs. + * @param tagKey DICOM tag specifying the attribute to be searched for + * @param value variable in which the reference to the element value is stored + * @param count stores number of items in the result array (if not NULL) + * @param searchIntoSub flag indicating whether to search into sequences or not + * @return EC_Normal upon success, an error code otherwise. + */ + OFCondition findAndGetUint64Array(const DcmTagKey &tagKey, + const Uint64 *&value, + unsigned long *count = NULL, + const OFBool searchIntoSub = OFFalse); + + /** find element and get value as a signed 64-bit integer. + * Applicable to the following VRs: SV + * The result variable 'value' is automatically set to zero if an error occurs. + * @param tagKey DICOM tag specifying the attribute to be searched for + * @param value variable in which the element value is stored + * @param pos index of the value in case of multi-valued elements (0..vm-1) + * @param searchIntoSub flag indicating whether to search into sequences or not + * @return EC_Normal upon success, an error code otherwise. + */ + OFCondition findAndGetSint64(const DcmTagKey &tagKey, + Sint64 &value, + const unsigned long pos = 0, + const OFBool searchIntoSub = OFFalse); + + /** find element and get value as an array of signed 64-bit integers. + * Applicable to the following VRs: SV + * The result variable 'value' is automatically set to NULL if an error occurs. + * @param tagKey DICOM tag specifying the attribute to be searched for + * @param value variable in which the reference to the element value is stored + * @param count stores number of items in the result array (if not NULL) + * @param searchIntoSub flag indicating whether to search into sequences or not + * @return EC_Normal upon success, an error code otherwise. + */ + OFCondition findAndGetSint64Array(const DcmTagKey &tagKey, + const Sint64 *&value, + unsigned long *count = NULL, + const OFBool searchIntoSub = OFFalse); + /** find element and get value as a (signed) long integer. * Applicable to the following VRs: IS, OL, SL, SS, UL, US * The result variable 'value' is automatically set to zero if an error occurs. diff --git a/dcmdata/include/dcmtk/dcmdata/dcmetinf.h b/dcmdata/include/dcmtk/dcmdata/dcmetinf.h index 4342a955..7d1c7d0d 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcmetinf.h +++ b/dcmdata/include/dcmtk/dcmdata/dcmetinf.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -115,7 +115,7 @@ class DCMTK_DCMDATA_EXPORT DcmMetaInfo * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcobject.h b/dcmdata/include/dcmtk/dcmdata/dcobject.h index 5acb6fed..c0d5a683 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcobject.h +++ b/dcmdata/include/dcmtk/dcmdata/dcobject.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -492,7 +492,7 @@ class DCMTK_DCMDATA_EXPORT DcmObject * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, always returns EC_Illegal Call */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); /** write object in JSON format to a stream @@ -500,7 +500,7 @@ class DCMTK_DCMDATA_EXPORT DcmObject * @param format used to format and customize the output * @return status, always returns EC_Illegal Call */ - virtual OFCondition writeJson(STD_NAMESPACE ostream&out, + virtual OFCondition writeJson(STD_NAMESPACE ostream &out, DcmJsonFormat &format); /** special write method for creation of digital signatures (abstract) diff --git a/dcmdata/include/dcmtk/dcmdata/dcpixel.h b/dcmdata/include/dcmtk/dcmdata/dcpixel.h index c3061c5f..3235f9d2 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcpixel.h +++ b/dcmdata/include/dcmtk/dcmdata/dcpixel.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -249,7 +249,8 @@ private: public: - /** constructor + /** constructor. + * Create new element from given tag and length. * @param tag attribute tag * @param len length of the attribute value */ @@ -327,7 +328,7 @@ public: * @param pixelFileName optional filename used to write the raw pixel data file * @param pixelCounter optional counter used for automatic pixel data filename creation */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, @@ -375,7 +376,7 @@ public: * @param maxReadLength Maximum read length for reading an attribute value. * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition read(DcmInputStream & inStream, + virtual OFCondition read(DcmInputStream &inStream, const E_TransferSyntax ixfer, const E_GrpLenEncoding glenc = EGL_noChange, const Uint32 maxReadLength = DCM_MaxReadLength); @@ -396,7 +397,7 @@ public: * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); /** special write method for creation of digital signatures diff --git a/dcmdata/include/dcmtk/dcmdata/dcpixseq.h b/dcmdata/include/dcmtk/dcmdata/dcpixseq.h index fbe57e55..78c0cc69 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcpixseq.h +++ b/dcmdata/include/dcmtk/dcmdata/dcpixseq.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -58,7 +58,8 @@ public: // constructor allowing construction using an explicit value length. friend class DcmPixelData; - /** constructor + /** constructor. + * Create new element from given tag. * @param tag attribute tag */ DcmPixelSequence(const DcmTag &tag); @@ -150,7 +151,7 @@ public: virtual OFCondition remove(DcmPixelItem * &item, const unsigned long num); - /** remove pixel item from list. Tthe pixel item is not deleted; + /** remove pixel item from list. The pixel item is not deleted; * the caller is responsible for further management of the DcmPixelItem object. * @param item pointer to element to be removed from list * @return EC_Normal if successful, an error code otherwise @@ -186,7 +187,7 @@ public: * @param maxReadLength Maximum read length for reading an attribute value. * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition read(DcmInputStream & inStream, + virtual OFCondition read(DcmInputStream &inStream, const E_TransferSyntax ixfer, const E_GrpLenEncoding glenc = EGL_noChange, const Uint32 maxReadLength = DCM_MaxReadLength); diff --git a/dcmdata/include/dcmtk/dcmdata/dcpxitem.h b/dcmdata/include/dcmtk/dcmdata/dcpxitem.h index 231b90e9..1b96bf9d 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcpxitem.h +++ b/dcmdata/include/dcmtk/dcmdata/dcpxitem.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -47,7 +47,8 @@ class DCMTK_DCMDATA_EXPORT DcmPixelItem : public DcmOtherByteOtherWord { public: - /** constructor + /** constructor. + * Create new element from given tag. * @param tag attribute tag * @param len length of the attribute value */ diff --git a/dcmdata/include/dcmtk/dcmdata/dcsequen.h b/dcmdata/include/dcmtk/dcmdata/dcsequen.h index 3e20d27d..62efe130 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcsequen.h +++ b/dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -48,7 +48,8 @@ public: // constructor allowing construction using an explicit value length. friend class DcmItem; - /** constructor + /** constructor. + * Create new element from given tag. * @param tag attribute tag */ DcmSequenceOfItems(const DcmTag &tag); @@ -137,7 +138,7 @@ public: * @param pixelFileName not used (used in certain sub-classes of this class) * @param pixelCounter not used (used in certain sub-classes of this class) */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, @@ -293,7 +294,7 @@ public: * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); /** write object in JSON format @@ -301,7 +302,7 @@ public: * @param format used to format and customize the output * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeJson(STD_NAMESPACE ostream&out, + virtual OFCondition writeJson(STD_NAMESPACE ostream &out, DcmJsonFormat &format); /** special write method for creation of digital signatures diff --git a/dcmdata/include/dcmtk/dcmdata/dctk.h b/dcmdata/include/dcmtk/dcmdata/dctk.h index 2290d6ca..1e8681de 100644 --- a/dcmdata/include/dcmtk/dcmdata/dctk.h +++ b/dcmdata/include/dcmtk/dcmdata/dctk.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2016, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -89,12 +89,15 @@ #include "dcmtk/dcmdata/dcvrus.h" #include "dcmtk/dcmdata/dcvrsl.h" #include "dcmtk/dcmdata/dcvrul.h" +#include "dcmtk/dcmdata/dcvrsv.h" +#include "dcmtk/dcmdata/dcvruv.h" #include "dcmtk/dcmdata/dcvrulup.h" #include "dcmtk/dcmdata/dcvrfl.h" #include "dcmtk/dcmdata/dcvrfd.h" #include "dcmtk/dcmdata/dcvrof.h" #include "dcmtk/dcmdata/dcvrod.h" #include "dcmtk/dcmdata/dcvrol.h" +#include "dcmtk/dcmdata/dcvrov.h" // misc supporting tools #include "dcmtk/dcmdata/cmdlnarg.h" diff --git a/dcmdata/include/dcmtk/dcmdata/dcuid.h b/dcmdata/include/dcmtk/dcmdata/dcuid.h index fb2464c4..7a6fafe5 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcuid.h +++ b/dcmdata/include/dcmtk/dcmdata/dcuid.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -516,6 +516,8 @@ DCMTK_DCMDATA_EXPORT unsigned long dcmGuessModalityBytes(const char *sopClassUID #define UID_AcquisitionContextSRStorage "1.2.840.10008.5.1.4.1.1.88.71" #define UID_SimplifiedAdultEchoSRStorage "1.2.840.10008.5.1.4.1.1.88.72" #define UID_PatientRadiationDoseSRStorage "1.2.840.10008.5.1.4.1.1.88.73" +#define UID_PlannedImagingAgentAdministrationSRStorage "1.2.840.10008.5.1.4.1.1.88.74" +#define UID_PerformedImagingAgentAdministrationSRStorage "1.2.840.10008.5.1.4.1.1.88.75" #define UID_ContentAssessmentResultsStorage "1.2.840.10008.5.1.4.1.1.90.1" #define UID_EncapsulatedPDFStorage "1.2.840.10008.5.1.4.1.1.104.1" #define UID_EncapsulatedCDAStorage "1.2.840.10008.5.1.4.1.1.104.2" @@ -537,6 +539,10 @@ DCMTK_DCMDATA_EXPORT unsigned long dcmGuessModalityBytes(const char *sopClassUID #define UID_RTTreatmentSummaryRecordStorage "1.2.840.10008.5.1.4.1.1.481.7" #define UID_RTIonPlanStorage "1.2.840.10008.5.1.4.1.1.481.8" #define UID_RTIonBeamsTreatmentRecordStorage "1.2.840.10008.5.1.4.1.1.481.9" +#define UID_RTPhysicianIntentStorage "1.2.840.10008.5.1.4.1.1.481.10" +#define UID_RTSegmentAnnotationStorage "1.2.840.10008.5.1.4.1.1.481.11" +#define UID_RTRadiationSetStorage "1.2.840.10008.5.1.4.1.1.481.12" +#define UID_CArmPhotonElectronRadiationStorage "1.2.840.10008.5.1.4.1.1.481.13" #define UID_RTBeamsDeliveryInstructionStorage "1.2.840.10008.5.1.4.34.7" #define UID_RTBrachyApplicationSetupDeliveryInstructionStorage "1.2.840.10008.5.1.4.34.10" #define UID_HangingProtocolStorage "1.2.840.10008.5.1.4.38.1" @@ -786,6 +792,7 @@ DCMTK_DCMDATA_EXPORT unsigned long dcmGuessModalityBytes(const char *sopClassUID #define UID_SPM2SINGLESUBJT1FrameOfReference "1.2.840.10008.1.4.1.18" #define UID_ICBM452T1FrameOfReference "1.2.840.10008.1.4.2.1" #define UID_ICBMSingleSubjectMRIFrameOfReference "1.2.840.10008.1.4.2.2" +#define UID_IEC61217FixedCoordinateSystemFrameOfReference "1.2.840.10008.1.4.3.1" // Well-known SOP Instances for Color Palettes #define UID_HotIronColorPaletteSOPInstance "1.2.840.10008.1.5.1" diff --git a/dcmdata/include/dcmtk/dcmdata/dcvr.h b/dcmdata/include/dcmtk/dcmdata/dcvr.h index 7db51d0e..a643392b 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvr.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvr.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -75,6 +75,24 @@ extern DCMTK_DCMDATA_EXPORT OFGlobal dcmEnableUniversalResourceIdentifie */ extern DCMTK_DCMDATA_EXPORT OFGlobal dcmEnableUnlimitedCharactersVRGeneration; /* default OFTrue */ +/** Global flag to enable/disable the generation of VR=OV, which has been + * introduced after the first edition of the DICOM standard (1993). + * If disabled, the VR=UN (if enabled) or alternatively VR=OB is used. + */ +extern DCMTK_DCMDATA_EXPORT OFGlobal dcmEnableOther64bitVeryLongVRGeneration; /* default OFTrue */ + +/** Global flag to enable/disable the generation of VR=SV, which has been + * introduced after the first edition of the DICOM standard (1993). + * If disabled, the VR=UN (if enabled) or alternatively VR=OB is used. + */ +extern DCMTK_DCMDATA_EXPORT OFGlobal dcmEnableSigned64bitVeryLongVRGeneration; /* default OFTrue */ + +/** Global flag to enable/disable the generation of VR=UV, which has been + * introduced after the first edition of the DICOM standard (1993). + * If disabled, the VR=UN (if enabled) or alternatively VR=OB is used. + */ +extern DCMTK_DCMDATA_EXPORT OFGlobal dcmEnableUnsigned64bitVeryLongVRGeneration; /* default OFTrue */ + /** Global flag to enable/disable the automatic re-conversion of defined * length UN elements read in an explicit VR transfer syntax, if the real * VR is defined in the data dictionary. @@ -149,6 +167,9 @@ enum DcmEVR /// other long EVR_OL, + /// other 64-bit very long + EVR_OV, + /// other word EVR_OW, @@ -170,6 +191,9 @@ enum DcmEVR /// short text EVR_ST, + /// signed 64-bit very long + EVR_SV, + /// time string EVR_TM, @@ -191,6 +215,9 @@ enum DcmEVR /// unlimited text EVR_UT, + /// unsigned 64-bit very long + EVR_UV, + /// OB or OW depending on context EVR_ox, @@ -381,6 +408,12 @@ public: */ OFBool usesExtendedLengthEncoding() const; + /** returns true if VR supports undefined length for the value length field + * and a sequence delimitation item marks the end of the value field + * @return true if VR supports undefined length, false otherwise + */ + OFBool supportsUndefinedLength() const; + /** check if VRs are equivalent. * VRs are considered equivalent if equal or if one of them is an internal * VR and the other one is a possible standard VR to which the internal one diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrat.h b/dcmdata/include/dcmtk/dcmdata/dcvrat.h index 4189aef4..17d046d8 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrat.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrat.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -46,7 +46,6 @@ class DCMTK_DCMDATA_EXPORT DcmAttributeTag /** constructor. * Create new element from given tag. * @param tag DICOM tag for the new element - * @param len value length for the new element */ DcmAttributeTag(const DcmTag &tag); @@ -141,7 +140,7 @@ class DCMTK_DCMDATA_EXPORT DcmAttributeTag * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, @@ -272,6 +271,7 @@ protected: */ DcmAttributeTag(const DcmTag &tag, const Uint32 len); + }; diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrfd.h b/dcmdata/include/dcmtk/dcmdata/dcvrfd.h index c89f31aa..737447c0 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrfd.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrfd.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -135,7 +135,7 @@ class DCMTK_DCMDATA_EXPORT DcmFloatingPointDouble * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, @@ -168,11 +168,11 @@ class DCMTK_DCMDATA_EXPORT DcmFloatingPointDouble OFBool normalize = OFTrue); /** set particular element value to given double - * @param doubleval double precision floating point value to be set + * @param doubleVal double precision floating point value to be set * @param pos index of the value to be set (0 = first position) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition putFloat64(const Float64 doubleval, + virtual OFCondition putFloat64(const Float64 doubleVal, const unsigned long pos = 0); /** set element value to given double array data @@ -229,6 +229,7 @@ class DCMTK_DCMDATA_EXPORT DcmFloatingPointDouble */ DcmFloatingPointDouble(const DcmTag &tag, const Uint32 len); + }; diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrfl.h b/dcmdata/include/dcmtk/dcmdata/dcvrfl.h index 052dc304..fc4756cb 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrfl.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrfl.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -137,7 +137,7 @@ class DCMTK_DCMDATA_EXPORT DcmFloatingPointSingle * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrobow.h b/dcmdata/include/dcmtk/dcmdata/dcvrobow.h index febc13a8..e2ab85c5 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrobow.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrobow.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -149,7 +149,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherByteOtherWord * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, @@ -180,7 +180,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherByteOtherWord * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); /** write object in JSON format to a stream @@ -188,7 +188,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherByteOtherWord * @param format used to format and customize the output * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeJson(STD_NAMESPACE ostream&out, + virtual OFCondition writeJson(STD_NAMESPACE ostream &out, DcmJsonFormat &format); /** special write method for creation of digital signatures @@ -363,7 +363,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherByteOtherWord * @param pixelFileName optional filename used to write the raw pixel data file * @param pixelCounter optional counter used for automatic pixel data filename creation */ - void printPixel(STD_NAMESPACE ostream&out, + void printPixel(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char *pixelFileName, diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrod.h b/dcmdata/include/dcmtk/dcmdata/dcvrod.h index 5b35efd7..0d54c63e 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrod.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrod.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2013-2016, OFFIS e.V. + * Copyright (C) 2013-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -108,7 +108,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherDouble * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); /** write object in JSON format to a stream @@ -116,8 +116,18 @@ class DCMTK_DCMDATA_EXPORT DcmOtherDouble * @param format used to format and customize the output * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeJson(STD_NAMESPACE ostream&out, + virtual OFCondition writeJson(STD_NAMESPACE ostream &out, DcmJsonFormat &format); + + /** create an empty Float64 array of given number of double values and set it. + * All array elements are initialized with a value of 0 (using 'memzero'). + * @param numDoubles number of double values (64 bit) to be created + * @param doubleVals stores the pointer to the resulting Float64 array + * (set to NULL in case of error) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition createFloat64Array(const Uint32 numDoubles, + Float64 *&doubleVals); }; diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrof.h b/dcmdata/include/dcmtk/dcmdata/dcvrof.h index eca29dcc..9442ca34 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrof.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrof.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2002-2016, OFFIS e.V. + * Copyright (C) 2002-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -108,7 +108,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherFloat * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); /** write object in JSON format to a stream @@ -116,8 +116,20 @@ class DCMTK_DCMDATA_EXPORT DcmOtherFloat * @param format used to format and customize the output * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeJson(STD_NAMESPACE ostream&out, + virtual OFCondition writeJson(STD_NAMESPACE ostream &out, DcmJsonFormat &format); + + /** create an empty Float32 array of given number of float values and set it. + * All array elements are initialized with a value of 0 (using 'memzero'). + * @param numFloats number of float values (32 bit) to be created + * @param floatVals stores the pointer to the resulting Float32 array + * (set to NULL in case of error) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition createFloat32Array(const Uint32 numFloats, + Float32 *&floatVals); + + }; diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrol.h b/dcmdata/include/dcmtk/dcmdata/dcvrol.h index c7fc6274..24b255cb 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrol.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrol.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2016-2017, OFFIS e.V. + * Copyright (C) 2016-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -45,7 +45,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherLong friend class DcmItem; /** constructor. - * Create new element from given tag and length. + * Create new element from given tag. * @param tag DICOM tag for the new element */ DcmOtherLong(const DcmTag &tag); @@ -68,7 +68,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherLong /** clone method * @return deep copy of this object */ - virtual DcmOtherLong *clone() const + virtual DcmObject *clone() const { return new DcmOtherLong(*this); } @@ -110,7 +110,7 @@ class DCMTK_DCMDATA_EXPORT DcmOtherLong * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) * @return status, EC_Normal if successful, an error code otherwise */ - virtual OFCondition writeXML(STD_NAMESPACE ostream&out, + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, const size_t flags = 0); /** write object in JSON format @@ -121,6 +121,16 @@ class DCMTK_DCMDATA_EXPORT DcmOtherLong virtual OFCondition writeJson(STD_NAMESPACE ostream &out, DcmJsonFormat &format); + /** create an empty Uint32 array of given number of double-words and set it. + * All array elements are initialized with a value of 0 (using 'memzero'). + * @param numDoubleWords number of double-words (32 bit) to be created + * @param doubleWords stores the pointer to the resulting Uint32 array + * (set to NULL in case of error) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition createUint32Array(const Uint32 numDoubleWords, + Uint32 *&doubleWords); + protected: /** constructor. Create new element from given tag and length. diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrov.h b/dcmdata/include/dcmtk/dcmdata/dcvrov.h new file mode 100644 index 00000000..b955c17c --- /dev/null +++ b/dcmdata/include/dcmtk/dcmdata/dcvrov.h @@ -0,0 +1,153 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: Interface of class DcmOther64bitVeryLong + * + */ + + +#ifndef DCVROV_H +#define DCVROV_H + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmdata/dcvruv.h" + + +// forward declarations +class DcmJsonFormat; + + +/** a class representing the DICOM value representation 'Other 64-bit Very Long' (OV) + */ +class DCMTK_DCMDATA_EXPORT DcmOther64bitVeryLong + : public DcmUnsigned64bitVeryLong +{ + + public: + + // Make friend with DcmItem which requires access to protected + // constructor allowing construction using an explicit value length. + friend class DcmItem; + + /** constructor. + * Create new element from given tag. + * @param tag DICOM tag for the new element + */ + DcmOther64bitVeryLong(const DcmTag &tag); + + /** copy constructor + * @param old element to be copied + */ + DcmOther64bitVeryLong(const DcmOther64bitVeryLong &old); + + /** destructor + */ + virtual ~DcmOther64bitVeryLong(); + + /** assignment operator + * @param obj element to be assigned/copied + * @return reference to this object + */ + DcmOther64bitVeryLong &operator=(const DcmOther64bitVeryLong &obj); + + /** clone method + * @return deep copy of this object + */ + virtual DcmObject *clone() const + { + return new DcmOther64bitVeryLong(*this); + } + + /** virtual object copying. This method can be used for DcmObject + * and derived classes to get a deep copy of an object. Internally, + * the assignment operator is called if the given DcmObject parameter + * is of the same type as "this" object instance. If not, an error + * is returned. This function permits copying an object by value + * in a virtual way which therefore is different to just calling the + * assignment operator of DcmElement which could result in slicing + * the object. + * @param rhs - [in] The instance to copy from. Has to be of the same + * class type as "this" object + * @return EC_Normal if copying was successful, error otherwise + */ + virtual OFCondition copyFrom(const DcmObject& rhs); + + /** get element type identifier + * @return type identifier of this class (EVR_OV) + */ + virtual DcmEVR ident() const; + + /** check whether stored value conforms to the VR and to the specified VM + * @param vm parameter not used for this VR + * @param oldFormat parameter not used for this VR (only for DA, TM) + * @return always returns EC_Normal, i.e. currently no checks are performed + */ + virtual OFCondition checkValue(const OFString &vm = "", + const OFBool oldFormat = OFFalse); + + /** get value multiplicity + * @return always returns 1 (according to the DICOM standard) + */ + virtual unsigned long getVM(); + + /** write object in XML format to a stream + * @param out output stream to which the XML document is written + * @param flags optional flag used to customize the output (see DCMTypes::XF_xxx) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition writeXML(STD_NAMESPACE ostream &out, + const size_t flags = 0); + + /** write object in JSON format + * @param out output stream to which the JSON document is written + * @param format used to format and customize the output + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition writeJson(STD_NAMESPACE ostream &out, + DcmJsonFormat &format); + + /** create an empty Uint64 array of given number of quad-words and set it. + * All array elements are initialized with a value of 0 (using 'memzero'). + * @param numQuadWords number of quad-words (64 bit) to be created + * @param quadWords stores the pointer to the resulting Uint64 array + * (set to NULL in case of error) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition createUint64Array(const Uint32 numQuadWords, + Uint64 *&quadWords); + + + protected: + + /** constructor. Create new element from given tag and length. + * Only reachable from friend classes since construction with + * length different from 0 leads to a state with length being set but + * the element's value still being uninitialized. This can lead to crashes + * when the value is read or written. Thus the method calling this + * constructor with length > 0 must ensure that the element's value is + * explicitly initialized, too. + * @param tag DICOM tag for the new element + * @param len value length for the new element + */ + DcmOther64bitVeryLong(const DcmTag &tag, + const Uint32 len); + +}; + + +#endif // DCVROV_H diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrpobw.h b/dcmdata/include/dcmtk/dcmdata/dcvrpobw.h index 48b97f58..0183833e 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrpobw.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrpobw.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -115,7 +115,7 @@ public: * @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition read( - DcmInputStream & inStream, + DcmInputStream &inStream, const E_TransferSyntax ixfer, const E_GrpLenEncoding glenc, const Uint32 maxReadLength); diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrsl.h b/dcmdata/include/dcmtk/dcmdata/dcvrsl.h index 984f6b9f..0928b5e4 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrsl.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrsl.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -135,7 +135,7 @@ class DCMTK_DCMDATA_EXPORT DcmSignedLong * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrss.h b/dcmdata/include/dcmtk/dcmdata/dcvrss.h index 405abf70..2febddfc 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrss.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrss.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -135,7 +135,7 @@ class DCMTK_DCMDATA_EXPORT DcmSignedShort * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrsv.h b/dcmdata/include/dcmtk/dcmdata/dcvrsv.h new file mode 100644 index 00000000..ae81fe66 --- /dev/null +++ b/dcmdata/include/dcmtk/dcmdata/dcvrsv.h @@ -0,0 +1,229 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: Interface of class DcmSigned64bitVeryLong + * + */ + + +#ifndef DCVRSV_H +#define DCVRSV_H + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmdata/dcelem.h" + + +/** a class representing the DICOM value representation 'Signed 64-bit Very Long' (SV) + */ +class DCMTK_DCMDATA_EXPORT DcmSigned64bitVeryLong + : public DcmElement +{ + + public: + + // Make friend with DcmItem which requires access to protected + // constructor allowing construction using an explicit value length. + friend class DcmItem; + + /** constructor. + * Create new element from given tag. + * @param tag DICOM tag for the new element + */ + DcmSigned64bitVeryLong(const DcmTag &tag); + + /** copy constructor + * @param old element to be copied + */ + DcmSigned64bitVeryLong(const DcmSigned64bitVeryLong &old); + + /** destructor + */ + virtual ~DcmSigned64bitVeryLong(); + + /** assignment operator + * @param obj element to be assigned/copied + * @return reference to this object + */ + DcmSigned64bitVeryLong &operator=(const DcmSigned64bitVeryLong &obj); + + /** comparison operator that compares the normalized value of this object + * with a given object of the same type. The tag of the element is also + * considered as the first component that is compared, followed by the + * object types (VR, i.e. DCMTK'S EVR) and the comparison of all value + * components of the object, preferably in the order declared in the + * object (if applicable). + * @param rhs the right hand side of the comparison + * @return 0 if the object values are equal. + * -1 if this element has fewer components than the rhs element. + * Also -1 if the value of the first component that does not match + * is lower in this object than in rhs. Also returned if rhs + * cannot be casted to this object type or both objects are of + * different VR (i.e. the DcmEVR returned by the element's ident() + * call are different). + * 1 if either this element has more components than the rhs element, or + * if the first component that does not match is greater in this object than + * in rhs object. + */ + virtual int compare(const DcmElement& rhs) const; + + /** clone method + * @return deep copy of this object + */ + virtual DcmObject *clone() const + { + return new DcmSigned64bitVeryLong(*this); + } + + /** Virtual object copying. This method can be used for DcmObject + * and derived classes to get a deep copy of an object. Internally + * the assignment operator is called if the given DcmObject parameter + * is of the same type as "this" object instance. If not, an error + * is returned. This function permits copying an object by value + * in a virtual way which therefore is different to just calling the + * assignment operator of DcmElement which could result in slicing + * the object. + * @param rhs - [in] The instance to copy from. Has to be of the same + * class type as "this" object + * @return EC_Normal if copying was successful, error otherwise + */ + virtual OFCondition copyFrom(const DcmObject& rhs); + + /** get element type identifier + * @return type identifier of this class (EVR_SV) + */ + virtual DcmEVR ident() const; + + /** check whether stored value conforms to the VR and to the specified VM + * @param vm value multiplicity (according to the data dictionary) to be checked for. + * (See DcmElement::checkVM() for a list of valid values.) + * @param oldFormat parameter not used for this VR (only for DA, TM) + * @return status of the check, EC_Normal if value is correct, an error code otherwise + */ + virtual OFCondition checkValue(const OFString &vm = "1-n", + const OFBool oldFormat = OFFalse); + + /** get value multiplicity + * @return number of values in this element + */ + virtual unsigned long getVM(); + + /** get number of values stored in this element + * @return number of values in this element + */ + virtual unsigned long getNumberOfValues(); + + /** print element to a stream. + * The output format of the value is a backslash separated sequence of numbers. + * @param out output stream + * @param flags optional flag used to customize the output (see DCMTypes::PF_xxx) + * @param level current level of nested items. Used for indentation. + * @param pixelFileName not used + * @param pixelCounter not used + */ + virtual void print(STD_NAMESPACE ostream &out, + const size_t flags = 0, + const int level = 0, + const char *pixelFileName = NULL, + size_t *pixelCounter = NULL); + + /** get particular integer value + * @param sintVal reference to result variable (cleared in case of error) + * @param pos index of the value to be retrieved (0..vm-1) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getSint64(Sint64 &sintVal, + const unsigned long pos = 0); + + /** get reference to stored integer data. + * The number of entries can be determined by "getVM()". + * @param sintVals reference to result variable + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getSint64Array(Sint64 *&sintVals); + + /** get particular value as a character string + * @param stringVal variable in which the result value is stored + * @param pos index of the value in case of multi-valued elements (0..vm-1) + * @param normalize not used + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getOFString(OFString &stringVal, + const unsigned long pos, + OFBool normalize = OFTrue); + + /** set particular element value to given integer + * @param sintVal signed integer value to be set + * @param pos index of the value to be set (0 = first position) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition putSint64(const Sint64 sintVal, + const unsigned long pos = 0); + + /** set element value to given integer array data + * @param sintVals signed integer data to be set + * @param numSints number of integer values to be set + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition putSint64Array(const Sint64 *sintVals, + const unsigned long numSints); + + /** set element value from the given character string. + * The input string is expected to be a backslash separated sequence of + * numeric characters, e.g. "-333\-22\-1\0\1\22\333". + * @param stringVal input character string + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition putString(const char *stringVal); + + /** set element value from the given character string. + * The input string is expected to be a backslash separated sequence of + * numeric characters, e.g. "-333\-22\-1\0\1\22\333". + * The length of the string has to be specified explicitly. The string can, therefore, + * also contain more than one NULL byte. + * @param stringVal input character string + * @param stringLen length of the string (number of characters without the trailing + * NULL byte) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition putString(const char *stringVal, + const Uint32 stringLen); + + /** check the currently stored element value + * @param autocorrect correct value length if OFTrue + * @return status, EC_Normal if value length is correct, an error code otherwise + */ + virtual OFCondition verify(const OFBool autocorrect = OFFalse); + + protected: + + /** constructor. Create new element from given tag and length. + * Only reachable from friend classes since construction with + * length different from 0 leads to a state with length being set but + * the element's value still being uninitialized. This can lead to crashes + * when the value is read or written. Thus the method calling this + * constructor with length > 0 must ensure that the element's value is + * explicitly initialized, too. + * @param tag DICOM tag for the new element + * @param len value length for the new element + */ + DcmSigned64bitVeryLong(const DcmTag &tag, + const Uint32 len); +}; + + +#endif // DCVRSV_H diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrui.h b/dcmdata/include/dcmtk/dcmdata/dcvrui.h index 8fc27e43..8bb800d4 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrui.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrui.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -106,7 +106,7 @@ class DCMTK_DCMDATA_EXPORT DcmUniqueIdentifier * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrul.h b/dcmdata/include/dcmtk/dcmdata/dcvrul.h index e43073d5..41a9a1de 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrul.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrul.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -135,7 +135,7 @@ class DCMTK_DCMDATA_EXPORT DcmUnsignedLong * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrulup.h b/dcmdata/include/dcmtk/dcmdata/dcvrulup.h index 1c235de2..3304423e 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrulup.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrulup.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -45,7 +45,7 @@ class DCMTK_DCMDATA_EXPORT DcmUnsignedLongOffset friend class DcmItem; /** constructor. - * Create new element from given tag and length. + * Create new element from given tag. * @param tag DICOM tag for the new element */ DcmUnsignedLongOffset(const DcmTag &tag); @@ -134,4 +134,4 @@ class DCMTK_DCMDATA_EXPORT DcmUnsignedLongOffset }; -#endif // DCVRUSUP_H +#endif // DCVRULUP_H diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrur.h b/dcmdata/include/dcmtk/dcmdata/dcvrur.h index a8a989b5..50413ad2 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrur.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrur.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2014-2018, OFFIS e.V. + * Copyright (C) 2014-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -38,7 +38,8 @@ class DCMTK_DCMDATA_EXPORT DcmUniversalResourceIdentifierOrLocator public: - /** constructor + /** constructor. + * Create new element from given tag and length. * @param tag attribute tag * @param len length of the attribute value */ diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrus.h b/dcmdata/include/dcmtk/dcmdata/dcvrus.h index ef328ae4..3f935e3a 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrus.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrus.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -135,7 +135,7 @@ class DCMTK_DCMDATA_EXPORT DcmUnsignedShort * @param pixelFileName not used * @param pixelCounter not used */ - virtual void print(STD_NAMESPACE ostream&out, + virtual void print(STD_NAMESPACE ostream &out, const size_t flags = 0, const int level = 0, const char *pixelFileName = NULL, diff --git a/dcmdata/include/dcmtk/dcmdata/dcvrut.h b/dcmdata/include/dcmtk/dcmdata/dcvrut.h index a0b6248c..3b8121b9 100644 --- a/dcmdata/include/dcmtk/dcmdata/dcvrut.h +++ b/dcmdata/include/dcmtk/dcmdata/dcvrut.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -37,7 +37,8 @@ class DCMTK_DCMDATA_EXPORT DcmUnlimitedText public: - /** constructor + /** constructor. + * Create new element from given tag and length. * @param tag attribute tag * @param len length of the attribute value */ diff --git a/dcmdata/include/dcmtk/dcmdata/dcvruv.h b/dcmdata/include/dcmtk/dcmdata/dcvruv.h new file mode 100644 index 00000000..04db9bd8 --- /dev/null +++ b/dcmdata/include/dcmtk/dcmdata/dcvruv.h @@ -0,0 +1,230 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: Interface of class DcmUnsigned64bitVeryLong + * + */ + + +#ifndef DCVRUV_H +#define DCVRUV_H + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmdata/dcelem.h" + + +/** a class representing the DICOM value representation 'Unsigned 64-bit Very Long' (UV) + */ +class DCMTK_DCMDATA_EXPORT DcmUnsigned64bitVeryLong + : public DcmElement +{ + + public: + + // Make friend with DcmItem which requires access to protected + // constructor allowing construction using an explicit value length. + friend class DcmItem; + + /** constructor. + * Create new element from given tag. + * @param tag DICOM tag for the new element + */ + DcmUnsigned64bitVeryLong(const DcmTag &tag); + + /** copy constructor + * @param old element to be copied + */ + DcmUnsigned64bitVeryLong(const DcmUnsigned64bitVeryLong &old); + + /** destructor + */ + virtual ~DcmUnsigned64bitVeryLong(); + + /** assignment operator + * @param obj element to be assigned/copied + * @return reference to this object + */ + DcmUnsigned64bitVeryLong &operator=(const DcmUnsigned64bitVeryLong &obj); + + /** comparison operator that compares the normalized value of this object + * with a given object of the same type. The tag of the element is also + * considered as the first component that is compared, followed by the + * object types (VR, i.e. DCMTK'S EVR) and the comparison of all value + * components of the object, preferably in the order declared in the + * object (if applicable). + * @param rhs the right hand side of the comparison + * @return 0 if the object values are equal. + * -1 if this element has fewer components than the rhs element. + * Also -1 if the value of the first component that does not match + * is lower in this object than in rhs. Also returned if rhs + * cannot be casted to this object type or both objects are of + * different VR (i.e. the DcmEVR returned by the element's ident() + * call are different). + * 1 if either this element has more components than the rhs element, or + * if the first component that does not match is greater in this object + * than in rhs object. + */ + virtual int compare(const DcmElement& rhs) const; + + /** clone method + * @return deep copy of this object + */ + virtual DcmObject *clone() const + { + return new DcmUnsigned64bitVeryLong(*this); + } + + /** Virtual object copying. This method can be used for DcmObject + * and derived classes to get a deep copy of an object. Internally + * the assignment operator is called if the given DcmObject parameter + * is of the same type as "this" object instance. If not, an error + * is returned. This function permits copying an object by value + * in a virtual way which therefore is different to just calling the + * assignment operator of DcmElement which could result in slicing + * the object. + * @param rhs - [in] The instance to copy from. Has to be of the same + * class type as "this" object + * @return EC_Normal if copying was successful, error otherwise + */ + virtual OFCondition copyFrom(const DcmObject& rhs); + + /** get element type identifier + * @return type identifier of this class (EVR_UV) + */ + virtual DcmEVR ident() const; + + /** check whether stored value conforms to the VR and to the specified VM + * @param vm value multiplicity (according to the data dictionary) to be checked for. + * (See DcmElement::checkVM() for a list of valid values.) + * @param oldFormat parameter not used for this VR (only for DA, TM) + * @return status of the check, EC_Normal if value is correct, an error code otherwise + */ + virtual OFCondition checkValue(const OFString &vm = "1-n", + const OFBool oldFormat = OFFalse); + + /** get value multiplicity + * @return number of values in this element + */ + virtual unsigned long getVM(); + + /** get number of values stored in this element + * @return number of values in this element + */ + virtual unsigned long getNumberOfValues(); + + /** print element to a stream. + * The output format of the value is a backslash separated sequence of numbers. + * @param out output stream + * @param flags optional flag used to customize the output (see DCMTypes::PF_xxx) + * @param level current level of nested items. Used for indentation. + * @param pixelFileName not used + * @param pixelCounter not used + */ + virtual void print(STD_NAMESPACE ostream &out, + const size_t flags = 0, + const int level = 0, + const char *pixelFileName = NULL, + size_t *pixelCounter = NULL); + + /** get particular integer value + * @param uintVal reference to result variable (cleared in case of error) + * @param pos index of the value to be retrieved (0..vm-1) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getUint64(Uint64 &uintVal, + const unsigned long pos = 0); + + /** get reference to stored integer data. + * The number of entries can be determined by "getVM()". + * @param uintVals reference to result variable + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getUint64Array(Uint64 *&uintVals); + + /** get particular value as a character string + * @param stringVal variable in which the result value is stored + * @param pos index of the value in case of multi-valued elements (0..vm-1) + * @param normalize not used + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getOFString(OFString &stringVal, + const unsigned long pos, + OFBool normalize = OFTrue); + + /** set particular element value to given integer + * @param uintVal unsigned integer value to be set + * @param pos index of the value to be set (0 = first position) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition putUint64(const Uint64 uintVal, + const unsigned long pos = 0); + + /** set element value to given integer array data + * @param uintVals unsigned integer data to be set + * @param numUints number of integer values to be set + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition putUint64Array(const Uint64 *uintVals, + const unsigned long numUints); + + /** set element value from the given character string. + * The input string is expected to be a backslash separated sequence of + * numeric characters, e.g. "1\22\333\4444\55555\666666\7777777". + * @param stringVal input character string + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition putString(const char *stringVal); + + /** set element value from the given character string. + * The input string is expected to be a backslash separated sequence of + * numeric characters, e.g. "1\22\333\4444\55555\666666\7777777". + * The length of the string has to be specified explicitly. The string can, therefore, + * also contain more than one NULL byte. + * @param stringVal input character string + * @param stringLen length of the string (number of characters without the trailing + * NULL byte) + * @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition putString(const char *stringVal, + const Uint32 stringLen); + + /** check the currently stored element value + * @param autocorrect correct value length if OFTrue + * @return status, EC_Normal if value length is correct, an error code otherwise + */ + virtual OFCondition verify(const OFBool autocorrect = OFFalse); + + protected: + + /** constructor. Create new element from given tag and length. + * Only reachable from friend classes since construction with + * length different from 0 leads to a state with length being set but + * the element's value still being uninitialized. This can lead to crashes + * when the value is read or written. Thus the method calling this + * constructor with length > 0 must ensure that the element's value is + * explicitly initialized, too. + * @param tag DICOM tag for the new element + * @param len value length for the new element + */ + DcmUnsigned64bitVeryLong(const DcmTag &tag, + const Uint32 len); + +}; + + +#endif // DCVRUV_H diff --git a/dcmdata/libi2d/Makefile.dep b/dcmdata/libi2d/Makefile.dep index ae328157..2041e37f 100644 --- a/dcmdata/libi2d/Makefile.dep +++ b/dcmdata/libi2d/Makefile.dep @@ -33,23 +33,18 @@ i2d.o: i2d.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../include/dcmtk/dcmdata/dctypes.h ../include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -100,21 +95,16 @@ i2dbmps.o: i2dbmps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/libi2d/i2define.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/libi2d/i2define.h \ ../include/dcmtk/dcmdata/dcerror.h \ ../include/dcmtk/dcmdata/libi2d/i2doutpl.h \ ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ @@ -165,14 +155,9 @@ i2djpgs.o: i2djpgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/libi2d/i2define.h \ ../include/dcmtk/dcmdata/libi2d/i2doutpl.h \ ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ @@ -215,23 +200,18 @@ i2dplnsc.o: i2dplnsc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../include/dcmtk/dcmdata/dctypes.h ../include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -274,23 +254,18 @@ i2dplsc.o: i2dplsc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../include/dcmtk/dcmdata/dctypes.h ../include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -333,23 +308,18 @@ i2dplvlp.o: i2dplvlp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../include/dcmtk/dcmdata/dctypes.h ../include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ diff --git a/dcmdata/libi2d/i2djpgs.cc b/dcmdata/libi2d/i2djpgs.cc index 27bbc0c3..8a65fed0 100644 --- a/dcmdata/libi2d/i2djpgs.cc +++ b/dcmdata/libi2d/i2djpgs.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2017, OFFIS e.V. + * Copyright (C) 2007-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -199,6 +199,12 @@ OFCondition I2DJpegSource::readPixelData(Uint16& rows, cols = width; samplesPerPixel = spp; bitsAlloc = bps; + // Some output formats do not allow 12 bit at all, so it is more safe to + // use 16 bit for Bits Allocated (and therefore for Bits Stored, see below) + if (bitsAlloc == 12) + { + bitsAlloc = 16; + } bitsStored = bitsAlloc; highBit = OFstatic_cast(Uint16, bitsStored - 1); if (samplesPerPixel == 1) diff --git a/dcmdata/libsrc/CMakeLists.txt b/dcmdata/libsrc/CMakeLists.txt index 40b3d468..a88e6b33 100644 --- a/dcmdata/libsrc/CMakeLists.txt +++ b/dcmdata/libsrc/CMakeLists.txt @@ -9,9 +9,9 @@ DCMTK_ADD_LIBRARY(dcmdata dcostrmb dcostrmf dcostrmz dcpath dcpcache dcpixel dcpixseq dcpxitem dcrleccd dcrlecce dcrlecp dcrledrg dcrleerg dcrlerp dcsequen dcspchrs dcstack dcswap dctag dctagkey dctypes dcuid dcvr dcvrae dcvras dcvrat dcvrcs dcvrda dcvrds dcvrdt - dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrod dcvrof dcvrol dcvrpn dcvrpobw - dcvrsh dcvrsl dcvrss dcvrst dcvrtm dcvruc dcvrui dcvrul dcvrulup dcvrur dcvrus - dcvrut dcwcache dcxfer vrscan vrscanl) + dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrod dcvrof dcvrol dcvrov dcvrpn + dcvrpobw dcvrsh dcvrsl dcvrss dcvrst dcvrsv dcvrtm dcvruc dcvrui dcvrul dcvrulup + dcvrur dcvrus dcvrut dcvruv dcwcache dcxfer vrscan vrscanl) DCMTK_TARGET_LINK_MODULES(dcmdata ofstd oflog) DCMTK_TARGET_LINK_LIBRARIES(dcmdata ${ZLIB_LIBS}) diff --git a/dcmdata/libsrc/Makefile.dep b/dcmdata/libsrc/Makefile.dep index d6a93043..15cfb072 100644 --- a/dcmdata/libsrc/Makefile.dep +++ b/dcmdata/libsrc/Makefile.dep @@ -33,19 +33,12 @@ cmdlnarg.o: cmdlnarg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h + ../../ofstd/include/dcmtk/ofstd/oferror.h dcbytstr.o: dcbytstr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ @@ -88,15 +81,9 @@ dcbytstr.o: dcbytstr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcmatch.h @@ -145,14 +132,9 @@ dcchrstr.o: dcchrstr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -196,23 +178,18 @@ dccodec.o: dccodec.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dcitem.h \ ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcerror.h \ ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h \ ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ @@ -266,14 +243,9 @@ dcdatset.o: dcdatset.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dclist.h \ @@ -320,21 +292,17 @@ dcdatutl.o: dcdatutl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcerror.h \ ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dclist.h \ @@ -385,14 +353,9 @@ dcddirif.o: dcddirif.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -455,14 +418,9 @@ dcdicdir.o: dcdicdir.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -542,12 +500,7 @@ dcdict.o: dcdict.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h + ../../ofstd/include/dcmtk/ofstd/offile.h dcdictbi.o: dcdictbi.cc ../include/dcmtk/dcmdata/dcdict.h \ ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ @@ -603,14 +556,9 @@ dcdirrec.o: dcdirrec.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -643,10 +591,11 @@ dcdirrec.o: dcdirrec.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcspchrs.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcspchrs.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h dcelem.o: dcelem.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ @@ -694,30 +643,38 @@ dcelem.o: dcelem.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcswap.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcswap.h ../include/dcmtk/dcmdata/dcistrma.h \ ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcfcache.h \ ../include/dcmtk/dcmdata/dcwcache.h ../include/dcmtk/dcmdata/dcitem.h \ ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/vrscan.h \ ../include/dcmtk/dcmdata/dcpath.h ../include/dcmtk/dcmdata/dcdatset.h dcencdoc.o: dcencdoc.cc ../../config/include/dcmtk/config/osconfig.h \ - ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmdata/dcencdoc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ ../../ofstd/include/dcmtk/ofstd/ofexport.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ - ../include/dcmtk/dcmdata/dccodec.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oftypes.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ - ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ @@ -732,7 +689,6 @@ dcencdoc.o: dcencdoc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/appender.h \ ../../ofstd/include/dcmtk/ofstd/ofmem.h \ ../../ofstd/include/dcmtk/ofstd/ofutil.h \ - ../../ofstd/include/dcmtk/ofstd/oftraits.h \ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ ../../oflog/include/dcmtk/oflog/layout.h \ ../../oflog/include/dcmtk/oflog/streams.h \ @@ -744,57 +700,24 @@ dcencdoc.o: dcencdoc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dcpcache.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcencdoc.h ../include/dcmtk/dcmdata/dcpath.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ - ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dcerror.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ - ../include/dcmtk/dcmdata/dctk.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h \ - ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmdata/dchashdi.h ../include/dcmtk/dcmdata/dcdict.h \ - ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcfilefo.h \ - ../include/dcmtk/dcmdata/dcdicdir.h \ - ../../ofstd/include/dcmtk/ofstd/ofmap.h \ - ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcvrulup.h \ - ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcpixseq.h \ - ../include/dcmtk/dcmdata/dcofsetl.h ../include/dcmtk/dcmdata/dcbytstr.h \ - ../include/dcmtk/dcmdata/dcvrae.h ../include/dcmtk/dcmdata/dcvras.h \ - ../include/dcmtk/dcmdata/dcvrcs.h ../include/dcmtk/dcmdata/dcvrda.h \ + ../../ofstd/include/dcmtk/ofstd/ofxml.h \ + ../include/dcmtk/dcmdata/dcpath.h ../include/dcmtk/dcmdata/dccodec.h \ + ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcvrobow.h \ + ../include/dcmtk/dcmdata/dcvrui.h ../include/dcmtk/dcmdata/dcbytstr.h \ + ../include/dcmtk/dcmdata/dcvrda.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ - ../include/dcmtk/dcmdata/dcvrds.h ../include/dcmtk/dcmdata/dcvrdt.h \ - ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ - ../../ofstd/include/dcmtk/ofstd/oftime.h \ - ../include/dcmtk/dcmdata/dcvris.h ../include/dcmtk/dcmdata/dcvrtm.h \ - ../include/dcmtk/dcmdata/dcvrui.h ../include/dcmtk/dcmdata/dcvrur.h \ - ../include/dcmtk/dcmdata/dcchrstr.h ../include/dcmtk/dcmdata/dcvrlo.h \ - ../include/dcmtk/dcmdata/dcvrlt.h ../include/dcmtk/dcmdata/dcvrpn.h \ - ../include/dcmtk/dcmdata/dcvrsh.h ../include/dcmtk/dcmdata/dcvrst.h \ - ../include/dcmtk/dcmdata/dcvruc.h ../include/dcmtk/dcmdata/dcvrut.h \ - ../include/dcmtk/dcmdata/dcvrobow.h ../include/dcmtk/dcmdata/dcpixel.h \ - ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ - ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ - ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ - ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ - ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h \ - ../../ofstd/include/dcmtk/ofstd/ofxml.h + ../include/dcmtk/dcmdata/dcvrtm.h \ + ../../ofstd/include/dcmtk/ofstd/oftime.h dcerror.o: dcerror.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcerror.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ @@ -852,24 +775,19 @@ dcfilefo.o: dcfilefo.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcvrobow.h \ - ../include/dcmtk/dcmdata/dcvrui.h ../include/dcmtk/dcmdata/dcbytstr.h \ - ../include/dcmtk/dcmdata/dcvrul.h ../include/dcmtk/dcmdata/dcvrus.h \ - ../include/dcmtk/dcmdata/dcvrae.h ../include/dcmtk/dcmdata/dcvrsh.h \ - ../include/dcmtk/dcmdata/dcchrstr.h ../include/dcmtk/dcmdata/dcmetinf.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcostrmf.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcistrmf.h \ - ../include/dcmtk/dcmdata/dcwcache.h ../include/dcmtk/dcmdata/dcfcache.h \ - ../include/dcmtk/dcmdata/dcjson.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcvrobow.h ../include/dcmtk/dcmdata/dcvrui.h \ + ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dcvrul.h \ + ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrae.h \ + ../include/dcmtk/dcmdata/dcvrsh.h ../include/dcmtk/dcmdata/dcchrstr.h \ + ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dcostrma.h \ + ../include/dcmtk/dcmdata/dcostrmf.h ../include/dcmtk/dcmdata/dcistrma.h \ + ../include/dcmtk/dcmdata/dcistrmf.h ../include/dcmtk/dcmdata/dcwcache.h \ + ../include/dcmtk/dcmdata/dcfcache.h ../include/dcmtk/dcmdata/dcjson.h dcfilter.o: dcfilter.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcfilter.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ @@ -918,15 +836,10 @@ dcfilter.o: dcfilter.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ - ../include/dcmtk/dcmdata/dcpcache.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dcpcache.h dchashdi.o: dchashdi.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dchashdi.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ @@ -967,18 +880,7 @@ dchashdi.o: dchashdi.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/spi/logfact.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ - ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h + ../../oflog/include/dcmtk/oflog/tracelog.h dcistrma.o: dcistrma.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -1021,14 +923,9 @@ dcistrma.o: dcistrma.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcistrmz.h ../include/dcmtk/dcmdata/dcerror.h dcistrmb.o: dcistrmb.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcistrmb.h ../include/dcmtk/dcmdata/dcistrma.h \ @@ -1072,14 +969,9 @@ dcistrmb.o: dcistrmb.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h dcistrmf.o: dcistrmf.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcistrmf.h ../include/dcmtk/dcmdata/dcistrma.h \ @@ -1123,14 +1015,9 @@ dcistrmf.o: dcistrmf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h dcistrmz.o: dcistrmz.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcistrmz.h ../include/dcmtk/dcmdata/dcistrma.h \ @@ -1174,14 +1061,9 @@ dcistrmz.o: dcistrmz.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h dcitem.o: dcitem.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ @@ -1225,14 +1107,9 @@ dcitem.o: dcitem.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -1254,13 +1131,14 @@ dcitem.o: dcitem.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcchrstr.h ../include/dcmtk/dcmdata/dcvrlt.h \ ../include/dcmtk/dcmdata/dcvrod.h ../include/dcmtk/dcmdata/dcvrof.h \ ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrul.h \ + ../include/dcmtk/dcmdata/dcvrov.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrpn.h ../include/dcmtk/dcmdata/dcvrsh.h \ ../include/dcmtk/dcmdata/dcvrsl.h ../include/dcmtk/dcmdata/dcvrss.h \ - ../include/dcmtk/dcmdata/dcvrst.h ../include/dcmtk/dcmdata/dcvrtm.h \ - ../include/dcmtk/dcmdata/dcvruc.h ../include/dcmtk/dcmdata/dcvrui.h \ - ../include/dcmtk/dcmdata/dcvrulup.h ../include/dcmtk/dcmdata/dcvrur.h \ - ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrut.h \ - ../include/dcmtk/dcmdata/dcspchrs.h \ + ../include/dcmtk/dcmdata/dcvrst.h ../include/dcmtk/dcmdata/dcvrsv.h \ + ../include/dcmtk/dcmdata/dcvrtm.h ../include/dcmtk/dcmdata/dcvruc.h \ + ../include/dcmtk/dcmdata/dcvrui.h ../include/dcmtk/dcmdata/dcvrulup.h \ + ../include/dcmtk/dcmdata/dcvrur.h ../include/dcmtk/dcmdata/dcvrus.h \ + ../include/dcmtk/dcmdata/dcvrut.h ../include/dcmtk/dcmdata/dcspchrs.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmdata/dcjson.h @@ -1315,19 +1193,8 @@ dclist.o: dclist.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcmatch.o: dcmatch.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofmem.h \ ../../ofstd/include/dcmtk/ofstd/ofutil.h \ @@ -1369,17 +1236,6 @@ dcmatch.o: dcmatch.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ @@ -1435,14 +1291,9 @@ dcmetinf.o: dcmetinf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -1496,15 +1347,11 @@ dcobject.o: dcobject.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcswap.h ../include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h + ../include/dcmtk/dcmdata/dcostrma.h dcostrma.o: dcostrma.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcostrma.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -1541,20 +1388,15 @@ dcostrma.o: dcostrma.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmdata/dcostrmz.h ../include/dcmtk/dcmdata/dcerror.h dcostrmb.o: dcostrmb.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcostrmb.h ../include/dcmtk/dcmdata/dcostrma.h \ @@ -1592,20 +1434,15 @@ dcostrmb.o: dcostrmb.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmdata/dcerror.h dcostrmf.o: dcostrmf.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcostrmf.h ../include/dcmtk/dcmdata/dcostrma.h \ @@ -1643,20 +1480,15 @@ dcostrmf.o: dcostrmf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmdata/dcerror.h dcostrmz.o: dcostrmz.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcostrmz.h ../include/dcmtk/dcmdata/dcostrma.h \ @@ -1694,20 +1526,15 @@ dcostrmz.o: dcostrmz.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmdata/dcerror.h dcpath.o: dcpath.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcpath.h ../include/dcmtk/dcmdata/dcdatset.h \ @@ -1752,14 +1579,9 @@ dcpath.o: dcpath.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -1807,17 +1629,8 @@ dcpcache.o: dcpcache.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcstack.h dcpixel.o: dcpixel.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcpixel.h ../include/dcmtk/dcmdata/dcvrpobw.h \ ../include/dcmtk/dcmdata/dcvrobow.h ../include/dcmtk/dcmdata/dcelem.h \ @@ -1860,20 +1673,16 @@ dcpixel.o: dcpixel.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dccodec.h ../include/dcmtk/dcmdata/dcpixseq.h \ + ../include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dccodec.h \ - ../include/dcmtk/dcmdata/dcpixseq.h ../include/dcmtk/dcmdata/dcsequen.h \ ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcofsetl.h \ ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcitem.h \ ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcpxitem.h @@ -1925,16 +1734,12 @@ dcpixseq.o: dcpixseq.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcofsetl.h ../include/dcmtk/dcmdata/dcpxitem.h \ - ../include/dcmtk/dcmdata/dcvrobow.h ../include/dcmtk/dcmdata/dcitem.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcdeftag.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcofsetl.h \ + ../include/dcmtk/dcmdata/dcpxitem.h ../include/dcmtk/dcmdata/dcvrobow.h \ + ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcdeftag.h dcpxitem.o: dcpxitem.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ @@ -1976,20 +1781,17 @@ dcpxitem.o: dcpxitem.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcofsetl.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../include/dcmtk/dcmdata/dcswap.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcofsetl.h \ - ../include/dcmtk/dcmdata/dcswap.h ../include/dcmtk/dcmdata/dcistrma.h \ + ../include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../include/dcmtk/dcmdata/dcostrma.h ../include/dcmtk/dcmdata/dcwcache.h \ ../include/dcmtk/dcmdata/dcfcache.h dcrleccd.o: dcrleccd.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2028,32 +1830,27 @@ dcrleccd.o: dcrleccd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmdata/dcrlecp.h ../include/dcmtk/dcmdata/dcrledec.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcdatset.h \ + ../include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcrlecp.h ../include/dcmtk/dcmdata/dcrledec.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcdatset.h \ - ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dcobject.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dclist.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcdeftag.h \ - ../include/dcmtk/dcmdata/dcpixseq.h ../include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcofsetl.h \ - ../include/dcmtk/dcmdata/dcpxitem.h ../include/dcmtk/dcmdata/dcvrobow.h \ - ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcuid.h + ../include/dcmtk/dcmdata/dcobject.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcpixseq.h \ + ../include/dcmtk/dcmdata/dcsequen.h ../include/dcmtk/dcmdata/dcelem.h \ + ../include/dcmtk/dcmdata/dcofsetl.h ../include/dcmtk/dcmdata/dcpxitem.h \ + ../include/dcmtk/dcmdata/dcvrobow.h ../include/dcmtk/dcmdata/dcvrpobw.h \ + ../include/dcmtk/dcmdata/dcswap.h ../include/dcmtk/dcmdata/dcuid.h dcrlecce.o: dcrlecce.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcrlecce.h ../include/dcmtk/dcmdata/dccodec.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ @@ -2090,24 +1887,19 @@ dcrlecce.o: dcrlecce.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmdata/dcrleenc.h ../include/dcmtk/dcmdata/dcrlecp.h \ ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmdata/dcpixseq.h ../include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dclist.h \ @@ -2150,21 +1942,11 @@ dcrlecp.o: dcrlecp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h dcrledrg.o: dcrledrg.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcrledrg.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -2202,20 +1984,10 @@ dcrledrg.o: dcrledrg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmdata/dcrleccd.h ../include/dcmtk/dcmdata/dcrlecp.h dcrleerg.o: dcrleerg.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcrleerg.h \ @@ -2254,20 +2026,10 @@ dcrleerg.o: dcrleerg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmdata/dcrlecce.h ../include/dcmtk/dcmdata/dcrlecp.h dcrlerp.o: dcrlerp.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcrlerp.h ../include/dcmtk/dcmdata/dcpixel.h \ @@ -2311,19 +2073,9 @@ dcrlerp.o: dcrlerp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h dcsequen.o: dcsequen.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ @@ -2371,19 +2123,15 @@ dcsequen.o: dcsequen.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcitem.h \ - ../include/dcmtk/dcmdata/dcpcache.h ../include/dcmtk/dcmdata/dcdirrec.h \ - ../include/dcmtk/dcmdata/dcfilefo.h ../include/dcmtk/dcmdata/dcdatset.h \ - ../include/dcmtk/dcmdata/dcpxitem.h ../include/dcmtk/dcmdata/dcvrobow.h \ - ../include/dcmtk/dcmdata/dcofsetl.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcmetinf.h ../include/dcmtk/dcmdata/dcdeftag.h \ - ../include/dcmtk/dcmdata/dcistrma.h ../include/dcmtk/dcmdata/dcostrma.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dclist.h \ + ../include/dcmtk/dcmdata/dcitem.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcdirrec.h ../include/dcmtk/dcmdata/dcfilefo.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcpxitem.h \ + ../include/dcmtk/dcmdata/dcvrobow.h ../include/dcmtk/dcmdata/dcofsetl.h \ + ../include/dcmtk/dcmdata/dcswap.h ../include/dcmtk/dcmdata/dcmetinf.h \ + ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcistrma.h \ + ../include/dcmtk/dcmdata/dcostrma.h dcspchrs.o: dcspchrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcspchrs.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h \ @@ -2429,14 +2177,9 @@ dcspchrs.o: dcspchrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -2489,19 +2232,9 @@ dcswap.o: dcswap.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h + ../include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h dctag.o: dctag.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dctag.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ @@ -2576,19 +2309,6 @@ dctypes.o: dctypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h dcuid.o: dcuid.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ @@ -2625,20 +2345,14 @@ dcuid.o: dcuid.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofcrc32.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../ofstd/include/dcmtk/ofstd/ofcrc32.h \ ../../ofstd/include/dcmtk/ofstd/ofsockad.h dcvr.o: dcvr.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvr.h \ @@ -2676,19 +2390,7 @@ dcvr.o: dcvr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/spi/logfact.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ - ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h + ../../oflog/include/dcmtk/oflog/tracelog.h dcvrae.o: dcvrae.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrae.h ../include/dcmtk/dcmdata/dcbytstr.h \ ../include/dcmtk/dcmdata/dctypes.h \ @@ -2724,26 +2426,15 @@ dcvrae.o: dcvrae.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcmatch.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcmatch.h dcvras.o: dcvras.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvras.h ../include/dcmtk/dcmdata/dcbytstr.h \ ../include/dcmtk/dcmdata/dctypes.h \ @@ -2779,25 +2470,15 @@ dcvras.o: dcvras.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h dcvrat.o: dcvrat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcelem.h \ @@ -2839,19 +2520,9 @@ dcvrat.o: dcvrat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcjson.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcjson.h dcvrcs.o: dcvrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../include/dcmtk/dcmdata/dcvrcs.h ../include/dcmtk/dcmdata/dcbytstr.h \ @@ -2887,26 +2558,15 @@ dcvrcs.o: dcvrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcmatch.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcmatch.h dcvrda.o: dcvrda.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrda.h ../include/dcmtk/dcmdata/dcbytstr.h \ ../include/dcmtk/dcmdata/dctypes.h \ @@ -2942,28 +2602,23 @@ dcvrda.o: dcvrda.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../include/dcmtk/dcmdata/dcvrtm.h \ ../../ofstd/include/dcmtk/ofstd/oftime.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../include/dcmtk/dcmdata/dcmatch.h dcvrds.o: dcvrds.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrds.h \ @@ -3000,26 +2655,20 @@ dcvrds.o: dcvrds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ + ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../include/dcmtk/dcmdata/dcerror.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcjson.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcobject.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcjson.h + ../../ofstd/include/dcmtk/ofstd/oferror.h dcvrdt.o: dcvrdt.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrdt.h ../include/dcmtk/dcmdata/dcbytstr.h \ ../include/dcmtk/dcmdata/dctypes.h \ @@ -3055,30 +2704,25 @@ dcvrdt.o: dcvrdt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../../ofstd/include/dcmtk/ofstd/oftime.h \ ../include/dcmtk/dcmdata/dcvrda.h ../include/dcmtk/dcmdata/dcvrtm.h \ - ../include/dcmtk/dcmdata/dcmatch.h + ../include/dcmtk/dcmdata/dcmatch.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h dcvrfd.o: dcvrfd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ @@ -3124,14 +2768,8 @@ dcvrfd.o: dcvrfd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcvrfl.o: dcvrfl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ @@ -3177,14 +2815,8 @@ dcvrfl.o: dcvrfl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcvris.o: dcvris.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvris.h ../include/dcmtk/dcmdata/dcbytstr.h \ ../include/dcmtk/dcmdata/dctypes.h \ @@ -3220,26 +2852,15 @@ dcvris.o: dcvris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcjson.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcjson.h dcvrlo.o: dcvrlo.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcjson.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ @@ -3277,28 +2898,17 @@ dcvrlo.o: dcvrlo.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dcstack.h -dcvrlt.o: dcvrlt.cc ../../config/include/dcmtk/config/osconfig.h \ - ../include/dcmtk/dcmdata/dcvrlt.h ../include/dcmtk/dcmdata/dcchrstr.h \ - ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dctypes.h \ - ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h +dcvrlt.o: dcvrlt.cc ../../config/include/dcmtk/config/osconfig.h \ + ../include/dcmtk/dcmdata/dcvrlt.h ../include/dcmtk/dcmdata/dcchrstr.h \ + ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ ../../oflog/include/dcmtk/oflog/config.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ @@ -3330,25 +2940,15 @@ dcvrlt.o: dcvrlt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h dcvrobow.o: dcvrobow.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ @@ -3366,6 +2966,7 @@ dcvrobow.o: dcvrobow.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../ofstd/include/dcmtk/ofstd/ofuuid.h \ ../../ofstd/include/dcmtk/ofstd/ofrand.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../include/dcmtk/dcmdata/dcjson.h ../include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvrobow.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ @@ -3397,15 +2998,9 @@ dcvrobow.o: dcvrobow.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcdeftag.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcuid.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcdeftag.h \ + ../include/dcmtk/dcmdata/dcswap.h ../include/dcmtk/dcmdata/dcuid.h dcvrod.o: dcvrod.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofuuid.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -3416,14 +3011,19 @@ dcvrod.o: dcvrod.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ ../../ofstd/include/dcmtk/ofstd/ofrand.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../include/dcmtk/dcmdata/dcvrod.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../include/dcmtk/dcmdata/dcerror.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dctypes.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ ../../oflog/include/dcmtk/oflog/config.h \ @@ -3437,7 +3037,6 @@ dcvrod.o: dcvrod.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/appender.h \ ../../ofstd/include/dcmtk/ofstd/ofmem.h \ ../../ofstd/include/dcmtk/ofstd/ofutil.h \ - ../../ofstd/include/dcmtk/ofstd/oftraits.h \ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ ../../oflog/include/dcmtk/oflog/layout.h \ ../../oflog/include/dcmtk/oflog/streams.h \ @@ -3449,20 +3048,9 @@ dcvrod.o: dcvrod.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcswap.h \ - ../include/dcmtk/dcmdata/dcjson.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcswap.h ../include/dcmtk/dcmdata/dcjson.h dcvrof.o: dcvrof.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofuuid.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -3473,15 +3061,21 @@ dcvrof.o: dcvrof.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ ../../ofstd/include/dcmtk/ofstd/ofrand.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../include/dcmtk/dcmdata/dcjson.h ../include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvrof.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../include/dcmtk/dcmdata/dcerror.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dctypes.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ ../../oflog/include/dcmtk/oflog/config.h \ @@ -3495,7 +3089,6 @@ dcvrof.o: dcvrof.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/appender.h \ ../../ofstd/include/dcmtk/ofstd/ofmem.h \ ../../ofstd/include/dcmtk/ofstd/ofutil.h \ - ../../ofstd/include/dcmtk/ofstd/oftraits.h \ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ ../../oflog/include/dcmtk/oflog/layout.h \ ../../oflog/include/dcmtk/oflog/streams.h \ @@ -3507,19 +3100,8 @@ dcvrof.o: dcvrof.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcswap.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcswap.h dcvrol.o: dcvrol.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofuuid.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -3530,14 +3112,19 @@ dcvrol.o: dcvrol.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ ../../ofstd/include/dcmtk/ofstd/ofrand.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrul.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../include/dcmtk/dcmdata/dcerror.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dctypes.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ ../../oflog/include/dcmtk/oflog/config.h \ @@ -3551,7 +3138,6 @@ dcvrol.o: dcvrol.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/appender.h \ ../../ofstd/include/dcmtk/ofstd/ofmem.h \ ../../ofstd/include/dcmtk/ofstd/ofutil.h \ - ../../ofstd/include/dcmtk/ofstd/oftraits.h \ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ ../../oflog/include/dcmtk/oflog/layout.h \ ../../oflog/include/dcmtk/oflog/streams.h \ @@ -3563,20 +3149,59 @@ dcvrol.o: dcvrol.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcjson.h ../include/dcmtk/dcmdata/dcswap.h +dcvrov.o: dcvrov.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/ofuuid.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofrand.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcjson.h \ - ../include/dcmtk/dcmdata/dcswap.h + ../include/dcmtk/dcmdata/dcvrov.h ../include/dcmtk/dcmdata/dcvruv.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dcjson.h ../include/dcmtk/dcmdata/dcswap.h dcvrpn.o: dcvrpn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcjson.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ @@ -3614,24 +3239,13 @@ dcvrpn.o: dcvrpn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dcstack.h dcvrpobw.o: dcvrpobw.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcvrobow.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ @@ -3673,19 +3287,8 @@ dcvrpobw.o: dcvrpobw.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcvrsh.o: dcvrsh.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrsh.h ../include/dcmtk/dcmdata/dcchrstr.h \ ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dctypes.h \ @@ -3721,26 +3324,15 @@ dcvrsh.o: dcvrsh.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcjson.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcjson.h dcvrsl.o: dcvrsl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../include/dcmtk/dcmdata/dcvrsl.h ../include/dcmtk/dcmdata/dcelem.h \ @@ -3782,19 +3374,8 @@ dcvrsl.o: dcvrsl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcvrss.o: dcvrss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../include/dcmtk/dcmdata/dcvrss.h ../include/dcmtk/dcmdata/dcelem.h \ @@ -3836,37 +3417,76 @@ dcvrss.o: dcvrss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h +dcvrst.o: dcvrst.cc ../../config/include/dcmtk/config/osconfig.h \ + ../include/dcmtk/dcmdata/dcvrst.h ../include/dcmtk/dcmdata/dcchrstr.h \ + ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ + ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmdata/dcstack.h -dcvrst.o: dcvrst.cc ../../config/include/dcmtk/config/osconfig.h \ - ../include/dcmtk/dcmdata/dcvrst.h ../include/dcmtk/dcmdata/dcchrstr.h \ - ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dctypes.h \ - ../../oflog/include/dcmtk/oflog/oflog.h \ - ../../oflog/include/dcmtk/oflog/logger.h \ - ../../oflog/include/dcmtk/oflog/config.h \ +dcvrsv.o: dcvrsv.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcelem.h \ + ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ ../../ofstd/include/dcmtk/ofstd/ofexport.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ ../../oflog/include/dcmtk/oflog/config/defines.h \ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ ../../oflog/include/dcmtk/oflog/loglevel.h \ ../../ofstd/include/dcmtk/ofstd/ofvector.h \ - ../../ofstd/include/dcmtk/ofstd/oftypes.h \ - ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../oflog/include/dcmtk/oflog/tstring.h \ - ../../ofstd/include/dcmtk/ofstd/ofstring.h \ ../../oflog/include/dcmtk/oflog/tchar.h \ ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ ../../oflog/include/dcmtk/oflog/appender.h \ @@ -3884,23 +3504,6 @@ dcvrst.o: dcvrst.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmdata/dcobject.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcvrtm.o: dcvrtm.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -3937,26 +3540,21 @@ dcvrtm.o: dcvrtm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcbytstr.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../include/dcmtk/dcmdata/dcerror.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h \ + ../../ofstd/include/dcmtk/ofstd/oftime.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcbytstr.h \ - ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ - ../../ofstd/include/dcmtk/ofstd/oftime.h \ ../include/dcmtk/dcmdata/dcmatch.h dcvruc.o: dcvruc.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvruc.h ../include/dcmtk/dcmdata/dctypes.h \ @@ -3992,26 +3590,16 @@ dcvruc.o: dcvruc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcchrstr.h \ ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h dcvrui.o: dcvrui.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ @@ -4053,16 +3641,10 @@ dcvrui.o: dcvrui.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -4108,19 +3690,8 @@ dcvrul.o: dcvrul.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcvrulup.o: dcvrulup.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrulup.h ../include/dcmtk/dcmdata/dcvrul.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ @@ -4162,19 +3733,8 @@ dcvrulup.o: dcvrulup.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcvrur.o: dcvrur.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrur.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ @@ -4209,26 +3769,15 @@ dcvrur.o: dcvrur.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcbytstr.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ - ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ - ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmdata/dcmatch.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h ../include/dcmtk/dcmdata/dcmatch.h dcvrus.o: dcvrus.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcelem.h \ @@ -4270,19 +3819,8 @@ dcvrus.o: dcvrus.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h ../include/dcmtk/dcmdata/dcvr.h \ - ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmdata/dcstack.h + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcvrut.o: dcvrut.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrut.h ../include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ @@ -4317,24 +3855,57 @@ dcvrut.o: dcvrut.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcchrstr.h \ ../include/dcmtk/dcmdata/dcbytstr.h ../include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcxfer.h ../include/dcmtk/dcmdata/dcvr.h \ + ../include/dcmtk/dcmdata/dctag.h ../include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmdata/dcstack.h +dcvruv.o: dcvruv.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../include/dcmtk/dcmdata/dcvruv.h ../include/dcmtk/dcmdata/dcelem.h \ + ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h dcwcache.o: dcwcache.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -4381,14 +3952,9 @@ dcwcache.o: dcwcache.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcobject.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ @@ -4427,21 +3993,9 @@ dcxfer.o: dcxfer.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmdata/dcdefine.h ../include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmdata/dcuid.h mkdeftag.o: mkdeftag.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcdict.h \ @@ -4535,11 +4089,4 @@ vrscan.o: vrscan.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/spi/logfact.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ - ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h vrscani.h vrscanl.h + ../../oflog/include/dcmtk/oflog/tracelog.h vrscani.h vrscanl.h diff --git a/dcmdata/libsrc/Makefile.in b/dcmdata/libsrc/Makefile.in index d1964dbd..eca96cab 100644 --- a/dcmdata/libsrc/Makefile.in +++ b/dcmdata/libsrc/Makefile.in @@ -41,9 +41,9 @@ objs = dcpixseq.o dcpxitem.o dcuid.o dcerror.o dcencdoc.o\ dcsequen.o dcfilefo.o dcbytstr.o dcpixel.o dcvrae.o dcvras.o dcvrcs.o \ dccodec.o dcvrda.o dcvrds.o dcvrdt.o dcvris.o dcvrtm.o dcvrui.o \ dcchrstr.o dcvrlo.o dcvrlt.o dcvrpn.o dcvrsh.o dcvrst.o dcvrobow.o \ - dcvrat.o dcvrss.o dcvrus.o dcvrsl.o dcvrul.o dcvrulup.o dcvrfl.o \ - dcvrfd.o dcvrpobw.o dcvrof.o dcvrod.o dcvrol.o dcdirrec.o dcdicdir.o \ - dcrleccd.o dcrlecce.o dcrlecp.o dcrlerp.o dcrledrg.o dcrleerg.o \ + dcvrat.o dcvrss.o dcvrus.o dcvrsl.o dcvrsv.o dcvrul.o dcvruv.o dcvrulup.o \ + dcvrfl.o dcvrfd.o dcvrpobw.o dcvrof.o dcvrod.o dcvrol.o dcvrov.o dcdirrec.o \ + dcdicdir.o dcrleccd.o dcrlecce.o dcrlecp.o dcrlerp.o dcrledrg.o dcrleerg.o \ dcdictbi.o dctagkey.o dcdicent.o dcdict.o dcvr.o dchashdi.o cmdlnarg.o \ dcvrut.o dcvrur.o dcvruc.o dctypes.o dcpcache.o dcddirif.o dcistrma.o \ dcistrmb.o dcistrmf.o dcistrmz.o dcostrma.o dcostrmb.o dcostrmf.o \ diff --git a/dcmdata/libsrc/dcbytstr.cc b/dcmdata/libsrc/dcbytstr.cc index db0cab01..b8fa0b1c 100644 --- a/dcmdata/libsrc/dcbytstr.cc +++ b/dcmdata/libsrc/dcbytstr.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -652,6 +652,7 @@ OFCondition DcmByteString::verify(const OFBool autocorrect) /* check whether there is anything to verify at all */ if (maxLength != DCM_UndefinedLength) { + const unsigned long vm = getVM(); /* TODO: is it really a good idea to create a copy of the string? */ OFString value(str, len); size_t posStart = 0; @@ -661,7 +662,7 @@ OFCondition DcmByteString::verify(const OFBool autocorrect) { ++vmNum; /* search for next component separator */ - size_t posEnd = value.find('\\', posStart); + size_t posEnd = (vm > 1) ? value.find('\\', posStart) : OFString_npos; const size_t fieldLen = (posEnd == OFString_npos) ? value.length() - posStart : posEnd - posStart; /* check size limit for each string component */ if (fieldLen > maxLength) diff --git a/dcmdata/libsrc/dcchrstr.cc b/dcmdata/libsrc/dcchrstr.cc index 305146d6..7d595166 100644 --- a/dcmdata/libsrc/dcchrstr.cc +++ b/dcmdata/libsrc/dcchrstr.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -92,6 +92,7 @@ OFCondition DcmCharString::verify(const OFBool autocorrect) /* check for non-empty string */ if ((str != NULL) && (len > 0)) { + const unsigned long vm = getVM(); /* check whether there is anything to verify at all */ if (maxLen != DCM_UndefinedLength) { @@ -104,7 +105,7 @@ OFCondition DcmCharString::verify(const OFBool autocorrect) { ++vmNum; /* search for next component separator */ - const size_t posEnd = value.find('\\', posStart); + const size_t posEnd = (vm > 1) ? value.find('\\', posStart) : OFString_npos; const size_t fieldLen = (posEnd == OFString_npos) ? value.length() - posStart : posEnd - posStart; /* check size limit for each string component */ if (fieldLen > maxLen) @@ -115,9 +116,9 @@ OFCondition DcmCharString::verify(const OFBool autocorrect) errorFlag = EC_MaximumLengthViolated; if (autocorrect) { - /* We are currently not removing any characters since we do not know - * whether a character consists of one or more bytes. This will be - * fixed in a future version. + /* TODO: We are currently not removing any characters since we do not + * know whether a character consists of one or more bytes. + * This will be fixed in a future version. */ DCMDATA_DEBUG("DcmCharString::verify() not correcting value length since " << "multi-byte character sets are not yet supported, so cannot decide"); diff --git a/dcmdata/libsrc/dcdatset.cc b/dcmdata/libsrc/dcdatset.cc index 77c89628..3b8a3dd1 100644 --- a/dcmdata/libsrc/dcdatset.cc +++ b/dcmdata/libsrc/dcdatset.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -256,7 +256,7 @@ OFBool DcmDataset::canWriteXfer(const E_TransferSyntax newXfer, // ******************************** -void DcmDataset::print(STD_NAMESPACE ostream&out, +void DcmDataset::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char *pixelFileName, diff --git a/dcmdata/libsrc/dcddirif.cc b/dcmdata/libsrc/dcddirif.cc index 8fd97eca..da285853 100644 --- a/dcmdata/libsrc/dcddirif.cc +++ b/dcmdata/libsrc/dcddirif.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2002-2018, OFFIS e.V. + * Copyright (C) 2002-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -668,7 +668,9 @@ static E_DirRecType sopClassToRecordType(const OFString &sopClass) compare(sopClass, UID_ImplantationPlanSRDocumentStorage) || compare(sopClass, UID_AcquisitionContextSRStorage) || compare(sopClass, UID_SimplifiedAdultEchoSRStorage) || - compare(sopClass, UID_PatientRadiationDoseSRStorage)) + compare(sopClass, UID_PatientRadiationDoseSRStorage) || + compare(sopClass, UID_PerformedImagingAgentAdministrationSRStorage) || + compare(sopClass, UID_PlannedImagingAgentAdministrationSRStorage)) { result = ERT_SRDocument; } @@ -777,6 +779,13 @@ static E_DirRecType sopClassToRecordType(const OFString &sopClass) result = ERT_Tract; else if (compare(sopClass, UID_ContentAssessmentResultsStorage)) result = ERT_Assessment; + else if (compare(sopClass, UID_RTPhysicianIntentStorage) || + compare(sopClass, UID_RTSegmentAnnotationStorage) || + compare(sopClass, UID_RTRadiationSetStorage) || + compare(sopClass, UID_CArmPhotonElectronRadiationStorage)) + { + result = ERT_Radiotherapy; + } return result; } @@ -965,6 +974,7 @@ static OFCondition insertSortedUnder(DcmDirectoryRecord *parent, case ERT_SurfaceScan: case ERT_Tract: case ERT_Assessment: + case ERT_Radiotherapy: /* try to insert based on InstanceNumber */ result = insertWithISCriterion(parent, child, DCM_InstanceNumber); break; @@ -1555,7 +1565,11 @@ OFCondition DicomDirInterface::checkSOPClassAndXfer(DcmMetaInfo *metainfo, compare(mediaSOPClassUID, UID_RTBrachyTreatmentRecordStorage) || compare(mediaSOPClassUID, UID_RTBrachyApplicationSetupDeliveryInstructionStorage) || compare(mediaSOPClassUID, UID_RTIonPlanStorage) || - compare(mediaSOPClassUID, UID_RTIonBeamsTreatmentRecordStorage); + compare(mediaSOPClassUID, UID_RTIonBeamsTreatmentRecordStorage) || + compare(mediaSOPClassUID, UID_RTPhysicianIntentStorage) || + compare(mediaSOPClassUID, UID_RTSegmentAnnotationStorage) || + compare(mediaSOPClassUID, UID_RTRadiationSetStorage) || + compare(mediaSOPClassUID, UID_CArmPhotonElectronRadiationStorage); } /* is it one of the structured reporting SOP Classes? */ if (!found) @@ -1576,7 +1590,9 @@ OFCondition DicomDirInterface::checkSOPClassAndXfer(DcmMetaInfo *metainfo, compare(mediaSOPClassUID, UID_ImplantationPlanSRDocumentStorage) || compare(mediaSOPClassUID, UID_AcquisitionContextSRStorage) || compare(mediaSOPClassUID, UID_SimplifiedAdultEchoSRStorage) || - compare(mediaSOPClassUID, UID_PatientRadiationDoseSRStorage); + compare(mediaSOPClassUID, UID_PatientRadiationDoseSRStorage) || + compare(mediaSOPClassUID, UID_PerformedImagingAgentAdministrationSRStorage) || + compare(mediaSOPClassUID, UID_PlannedImagingAgentAdministrationSRStorage); } /* is it one of the waveform SOP Classes? */ if (!found) @@ -1604,8 +1620,7 @@ OFCondition DicomDirInterface::checkSOPClassAndXfer(DcmMetaInfo *metainfo, compare(mediaSOPClassUID, UID_AdvancedBlendingPresentationStateStorage) || compare(mediaSOPClassUID, UID_VolumeRenderingVolumetricPresentationStateStorage) || compare(mediaSOPClassUID, UID_SegmentedVolumeRenderingVolumetricPresentationStateStorage) || - compare(mediaSOPClassUID, UID_MultipleVolumeRenderingVolumetricPresentationStateStorage) || - compare(mediaSOPClassUID, UID_BasicStructuredDisplayStorage); + compare(mediaSOPClassUID, UID_MultipleVolumeRenderingVolumetricPresentationStateStorage); } /* is it one of the encapsulated document SOP Classes? */ if (!found) @@ -1660,6 +1675,7 @@ OFCondition DicomDirInterface::checkSOPClassAndXfer(DcmMetaInfo *metainfo, compare(mediaSOPClassUID, UID_MRSpectroscopyStorage) || compare(mediaSOPClassUID, UID_RealWorldValueMappingStorage) || compare(mediaSOPClassUID, UID_HangingProtocolStorage) || + compare(mediaSOPClassUID, UID_BasicStructuredDisplayStorage) || compare(mediaSOPClassUID, UID_StereometricRelationshipStorage) || compare(mediaSOPClassUID, UID_ColorPaletteStorage) || compare(mediaSOPClassUID, UID_TractographyResultsStorage) || @@ -2700,6 +2716,10 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo, if (!checkExistsWithValue(dataset, DCM_InstanceCreationDate, filename)) result = EC_MissingAttribute; break; + case ERT_Radiotherapy: + if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename)) + result = EC_MissingAttribute; + break; case ERT_Image: default: { @@ -2953,6 +2973,7 @@ OFBool DicomDirInterface::recordMatchesDataset(DcmDirectoryRecord *record, case ERT_SurfaceScan: case ERT_Tract: case ERT_Assessment: + case ERT_Radiotherapy: /* The attribute ReferencedSOPInstanceUID is automatically * put into a Directory Record when a filename is present. */ @@ -4125,7 +4146,7 @@ DcmDirectoryRecord *DicomDirInterface::buildTractRecord(DcmDirectoryRecord *reco if (record->error().good()) { DcmDataset *dataset = fileformat->getDataset(); - /* copy attribute values from dataset to surface record */ + /* copy attribute values from dataset to tract record */ copyElementType1(dataset, DCM_ContentDate, record, sourceFilename); copyElementType1(dataset, DCM_ContentTime, record, sourceFilename); copyElementType1(dataset, DCM_InstanceNumber, record, sourceFilename); @@ -4159,7 +4180,7 @@ DcmDirectoryRecord *DicomDirInterface::buildAssessmentRecord(DcmDirectoryRecord if (record->error().good()) { DcmDataset *dataset = fileformat->getDataset(); - /* copy attribute values from dataset to surface record */ + /* copy attribute values from dataset to assessment record */ copyElementType1(dataset, DCM_InstanceNumber, record, sourceFilename); copyElementType1(dataset, DCM_InstanceCreationDate, record, sourceFilename); copyElementType2(dataset, DCM_InstanceCreationTime, record, sourceFilename); @@ -4175,6 +4196,39 @@ DcmDirectoryRecord *DicomDirInterface::buildAssessmentRecord(DcmDirectoryRecord } +// create or update radiotherapy record and copy required values from dataset +DcmDirectoryRecord *DicomDirInterface::buildRadiotherapyRecord(DcmDirectoryRecord *record, + DcmFileFormat *fileformat, + const OFString &referencedFileID, + const OFFilename &sourceFilename) +{ + /* create new surface record */ + if (record == NULL) + record = new DcmDirectoryRecord(ERT_Radiotherapy, referencedFileID.c_str(), sourceFilename, fileformat); + if (record != NULL) + { + /* check whether new record is ok */ + if (record->error().good()) + { + DcmDataset *dataset = fileformat->getDataset(); + /* copy attribute values from dataset to radiotherapy record */ + copyElementType1(dataset, DCM_InstanceNumber, record, sourceFilename); + copyElementType1C(dataset, DCM_UserContentLabel, record, sourceFilename); + copyElementType1C(dataset, DCM_UserContentLongLabel, record, sourceFilename); + copyElementType2(dataset, DCM_ContentDescription, record, sourceFilename); + copyElementType2(dataset, DCM_ContentCreatorName, record, sourceFilename); + } else { + printRecordErrorMessage(record->error(), ERT_Radiotherapy, "create"); + /* free memory */ + delete record; + record = NULL; + } + } else + printRecordErrorMessage(EC_MemoryExhausted, ERT_Radiotherapy, "create"); + return record; +} + + // create or update image record and copy required values from dataset DcmDirectoryRecord *DicomDirInterface::buildImageRecord(DcmDirectoryRecord *record, DcmFileFormat *fileformat, @@ -4608,6 +4662,9 @@ DcmDirectoryRecord *DicomDirInterface::addRecord(DcmDirectoryRecord *parent, case ERT_Assessment: record = buildAssessmentRecord(record, fileformat, referencedFileID, sourceFilename); break; + case ERT_Radiotherapy: + record = buildRadiotherapyRecord(record, fileformat, referencedFileID, sourceFilename); + break; default: /* it can only be an image */ record = buildImageRecord(record, fileformat, referencedFileID, sourceFilename); diff --git a/dcmdata/libsrc/dcdicdir.cc b/dcmdata/libsrc/dcdicdir.cc index e0865537..2df96eed 100644 --- a/dcmdata/libsrc/dcdicdir.cc +++ b/dcmdata/libsrc/dcdicdir.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -793,7 +793,7 @@ OFCondition DcmDicomDir::insertMediaSOPUID( DcmMetaInfo &metaInfo ) // inout // ******************************** -void DcmDicomDir::print(STD_NAMESPACE ostream&out, +void DcmDicomDir::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char *pixelFileName, diff --git a/dcmdata/libsrc/dcdict.cc b/dcmdata/libsrc/dcdict.cc index 2c7793fc..5f8357fc 100644 --- a/dcmdata/libsrc/dcdict.cc +++ b/dcmdata/libsrc/dcdict.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -28,6 +28,7 @@ #include "dcmtk/dcmdata/dcdicent.h" #include "dcmtk/dcmdata/dctypes.h" #include "dcmtk/ofstd/ofstd.h" +#include "dcmtk/ofstd/offile.h" #define INCLUDE_CSTDLIB #define INCLUDE_CSTDIO @@ -253,7 +254,7 @@ splitFields(const char* line, char* fields[], int maxFields, char splitChar) len = p - line; } fields[foundFields] = OFstatic_cast(char *, malloc(len + 1)); - strncpy(fields[foundFields], line, len); + OFStandard::strlcpy(fields[foundFields], line, len+1); fields[foundFields][len] = '\0'; foundFields++; line = p + 1; diff --git a/dcmdata/libsrc/dcdictbi.cc b/dcmdata/libsrc/dcdictbi.cc index 06eec3c9..e757906c 100644 --- a/dcmdata/libsrc/dcdictbi.cc +++ b/dcmdata/libsrc/dcdictbi.cc @@ -4,7 +4,7 @@ ** ** User: joergr ** Host: thinkpad -** Date: 2018-11-15 17:07:40 +** Date: 2019-08-07 18:58:15 ** Prog: /home/joergr/Source/dcmtk-full/public/dcmdata/libsrc/mkdictbi ** ** From: ../data/dicom.dic @@ -825,7 +825,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0008, 0x1041, 0x0008, 0x1041, - EVR_SQ, "InstitutionalDepartmentTypeCodeSequence", 1, 1, "DICOM/CP_1809", + EVR_SQ, "InstitutionalDepartmentTypeCodeSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0008, 0x1048, 0x0008, 0x1048, @@ -3775,6 +3775,428 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_DS, "CardiacCalibrationRatio", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DLX_EXAMS_01" } +#endif + , { 0x0016, 0x0001, 0x0016, 0x0001, + EVR_DS, "WhitePoint", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0002, 0x0016, 0x0002, + EVR_DS, "PrimaryChromaticities", 3, 3, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0003, 0x0016, 0x0003, + EVR_UT, "BatteryLevel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0004, 0x0016, 0x0004, + EVR_DS, "ExposureTimeInSeconds", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0005, 0x0016, 0x0005, + EVR_DS, "FNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0006, 0x0016, 0x0006, + EVR_IS, "OECFRows", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0007, 0x0016, 0x0007, + EVR_IS, "OECFColumns", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0008, 0x0016, 0x0008, + EVR_UC, "OECFColumnNames", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0009, 0x0016, 0x0009, + EVR_DS, "OECFValues", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x000a, 0x0016, 0x000a, + EVR_IS, "SpatialFrequencyResponseRows", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x000b, 0x0016, 0x000b, + EVR_IS, "SpatialFrequencyResponseColumns", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x000c, 0x0016, 0x000c, + EVR_UC, "SpatialFrequencyResponseColumnNames", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x000d, 0x0016, 0x000d, + EVR_DS, "SpatialFrequencyResponseValues", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x000e, 0x0016, 0x000e, + EVR_IS, "ColorFilterArrayPatternRows", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x000f, 0x0016, 0x000f, + EVR_IS, "ColorFilterArrayPatternColumns", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0010, 0x0016, 0x0010, + EVR_DS, "ColorFilterArrayPatternValues", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0011, 0x0016, 0x0011, + EVR_US, "FlashFiringStatus", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0012, 0x0016, 0x0012, + EVR_US, "FlashReturnStatus", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0013, 0x0016, 0x0013, + EVR_US, "FlashMode", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0014, 0x0016, 0x0014, + EVR_US, "FlashFunctionPresent", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0015, 0x0016, 0x0015, + EVR_US, "FlashRedEyeMode", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0016, 0x0016, 0x0016, + EVR_US, "ExposureProgram", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0017, 0x0016, 0x0017, + EVR_UT, "SpectralSensitivity", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0018, 0x0016, 0x0018, + EVR_IS, "PhotographicSensitivity", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0019, 0x0016, 0x0019, + EVR_IS, "SelfTimerMode", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x001a, 0x0016, 0x001a, + EVR_US, "SensitivityType", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x001b, 0x0016, 0x001b, + EVR_IS, "StandardOutputSensitivity", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x001c, 0x0016, 0x001c, + EVR_IS, "RecommendedExposureIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x001d, 0x0016, 0x001d, + EVR_IS, "ISOSpeed", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x001e, 0x0016, 0x001e, + EVR_IS, "ISOSpeedLatitudeyyy", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x001f, 0x0016, 0x001f, + EVR_IS, "ISOSpeedLatitudezzz", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0020, 0x0016, 0x0020, + EVR_UT, "EXIFVersion", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0021, 0x0016, 0x0021, + EVR_DS, "ShutterSpeedValue", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0022, 0x0016, 0x0022, + EVR_DS, "ApertureValue", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0023, 0x0016, 0x0023, + EVR_DS, "BrightnessValue", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0024, 0x0016, 0x0024, + EVR_DS, "ExposureBiasValue", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0025, 0x0016, 0x0025, + EVR_DS, "MaxApertureValue", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0026, 0x0016, 0x0026, + EVR_DS, "SubjectDistance", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0027, 0x0016, 0x0027, + EVR_US, "MeteringMode", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0028, 0x0016, 0x0028, + EVR_US, "LightSource", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0029, 0x0016, 0x0029, + EVR_DS, "FocalLength", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x002a, 0x0016, 0x002a, + EVR_IS, "SubjectArea", 2, 4, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x002b, 0x0016, 0x002b, + EVR_OB, "MakerNote", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0030, 0x0016, 0x0030, + EVR_DS, "Temperature", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0031, 0x0016, 0x0031, + EVR_DS, "Humidity", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0032, 0x0016, 0x0032, + EVR_DS, "Pressure", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0033, 0x0016, 0x0033, + EVR_DS, "WaterDepth", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0034, 0x0016, 0x0034, + EVR_DS, "Acceleration", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0035, 0x0016, 0x0035, + EVR_DS, "CameraElevationAngle", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0036, 0x0016, 0x0036, + EVR_DS, "FlashEnergy", 1, 2, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0037, 0x0016, 0x0037, + EVR_IS, "SubjectLocation", 2, 2, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0038, 0x0016, 0x0038, + EVR_DS, "PhotographicExposureIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0039, 0x0016, 0x0039, + EVR_US, "SensingMethod", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x003a, 0x0016, 0x003a, + EVR_US, "FileSource", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x003b, 0x0016, 0x003b, + EVR_US, "SceneType", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0041, 0x0016, 0x0041, + EVR_US, "CustomRendered", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0042, 0x0016, 0x0042, + EVR_US, "ExposureMode", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0043, 0x0016, 0x0043, + EVR_US, "WhiteBalance", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0044, 0x0016, 0x0044, + EVR_DS, "DigitalZoomRatio", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0045, 0x0016, 0x0045, + EVR_IS, "FocalLengthIn35mmFilm", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0046, 0x0016, 0x0046, + EVR_US, "SceneCaptureType", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0047, 0x0016, 0x0047, + EVR_US, "GainControl", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0048, 0x0016, 0x0048, + EVR_US, "Contrast", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0049, 0x0016, 0x0049, + EVR_US, "Saturation", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x004a, 0x0016, 0x004a, + EVR_US, "Sharpness", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x004b, 0x0016, 0x004b, + EVR_OB, "DeviceSettingDescription", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x004c, 0x0016, 0x004c, + EVR_US, "SubjectDistanceRange", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x004d, 0x0016, 0x004d, + EVR_UT, "CameraOwnerName", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x004e, 0x0016, 0x004e, + EVR_DS, "LensSpecification", 4, 4, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x004f, 0x0016, 0x004f, + EVR_UT, "LensMake", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0050, 0x0016, 0x0050, + EVR_UT, "LensModel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0051, 0x0016, 0x0051, + EVR_UT, "LensSerialNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0061, 0x0016, 0x0061, + EVR_CS, "InteroperabilityIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0062, 0x0016, 0x0062, + EVR_OB, "InteroperabilityVersion", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0070, 0x0016, 0x0070, + EVR_OB, "GPSVersionID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0071, 0x0016, 0x0071, + EVR_CS, "GPSLatitudeRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0072, 0x0016, 0x0072, + EVR_DS, "GPSLatitude", 3, 3, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0073, 0x0016, 0x0073, + EVR_CS, "GPSLongitudeRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0074, 0x0016, 0x0074, + EVR_DS, "GPSLongitude", 3, 3, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0075, 0x0016, 0x0075, + EVR_US, "GPSAltitudeRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0076, 0x0016, 0x0076, + EVR_DS, "GPSAltitude", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0077, 0x0016, 0x0077, + EVR_DT, "GPSTimeStamp", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0078, 0x0016, 0x0078, + EVR_UT, "GPSSatellites", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0079, 0x0016, 0x0079, + EVR_CS, "GPSStatus", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x007a, 0x0016, 0x007a, + EVR_CS, "GPSMeasureMode", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x007b, 0x0016, 0x007b, + EVR_DS, "GPSDOP", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x007c, 0x0016, 0x007c, + EVR_CS, "GPSSpeedRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x007d, 0x0016, 0x007d, + EVR_DS, "GPSSpeed", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x007e, 0x0016, 0x007e, + EVR_CS, "GPSTrackRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x007f, 0x0016, 0x007f, + EVR_DS, "GPSTrack", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0080, 0x0016, 0x0080, + EVR_CS, "GPSImgDirectionRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0081, 0x0016, 0x0081, + EVR_DS, "GPSImgDirection", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0082, 0x0016, 0x0082, + EVR_UT, "GPSMapDatum", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0083, 0x0016, 0x0083, + EVR_CS, "GPSDestLatitudeRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0084, 0x0016, 0x0084, + EVR_DS, "GPSDestLatitude", 3, 3, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0085, 0x0016, 0x0085, + EVR_CS, "GPSDestLongitudeRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0086, 0x0016, 0x0086, + EVR_DS, "GPSDestLongitude", 3, 3, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0087, 0x0016, 0x0087, + EVR_CS, "GPSDestBearingRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0088, 0x0016, 0x0088, + EVR_DS, "GPSDestBearing", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x0089, 0x0016, 0x0089, + EVR_CS, "GPSDestDistanceRef", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x008a, 0x0016, 0x008a, + EVR_DS, "GPSDestDistance", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x008b, 0x0016, 0x008b, + EVR_OB, "GPSProcessingMethod", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x008c, 0x0016, 0x008c, + EVR_OB, "GPSAreaInformation", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x008d, 0x0016, 0x008d, + EVR_DT, "GPSDateStamp", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0016, 0x008e, 0x0016, 0x008e, + EVR_IS, "GPSDifferential", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } +#ifdef ENABLE_PRIVATE_TAGS , { 0x0017, 0x0000, 0x0017, 0x0000, EVR_LO, "ExtendedBodyPart", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -4036,6 +4458,10 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_SQ, "UDISequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0018, 0x100b, 0x0018, 0x100b, + EVR_UI, "ManufacturerDeviceClassUID", 1, -1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x0018, 0x1010, 0x0018, 0x1010, EVR_LO, "SecondaryCaptureDeviceID", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -4704,6 +5130,42 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_US, "ShutterPresentationColorCIELabValue", 3, 3, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0018, 0x1630, 0x0018, 0x1630, + EVR_CS, "OutlineShapeType", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0018, 0x1631, 0x0018, 0x1631, + EVR_FD, "OutlineLeftVerticalEdge", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0018, 0x1632, 0x0018, 0x1632, + EVR_FD, "OutlineRightVerticalEdge", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0018, 0x1633, 0x0018, 0x1633, + EVR_FD, "OutlineUpperHorizontalEdge", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0018, 0x1634, 0x0018, 0x1634, + EVR_FD, "OutlineLowerHorizontalEdge", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0018, 0x1635, 0x0018, 0x1635, + EVR_FD, "CenterOfCircularOutline", 2, 2, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0018, 0x1636, 0x0018, 0x1636, + EVR_FD, "DiameterOfCircularOutline", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0018, 0x1637, 0x0018, 0x1637, + EVR_UL, "NumberOfPolygonalVertices", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0018, 0x1638, 0x0018, 0x1638, + EVR_OF, "VerticesOfThePolygonalOutline", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x0018, 0x1700, 0x0018, 0x1700, EVR_CS, "CollimatorShape", 1, 3, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -6117,147 +6579,147 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9361, 0x0018, 0x9361, - EVR_CS, "MultienergyCTAcquisition", 1, 1, "DICOM/Supplement_188", + EVR_CS, "MultienergyCTAcquisition", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9362, 0x0018, 0x9362, - EVR_SQ, "MultienergyCTAcquisitionSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "MultienergyCTAcquisitionSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9363, 0x0018, 0x9363, - EVR_SQ, "MultienergyCTProcessingSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "MultienergyCTProcessingSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9364, 0x0018, 0x9364, - EVR_SQ, "MultienergyCTCharacteristicsSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "MultienergyCTCharacteristicsSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9365, 0x0018, 0x9365, - EVR_SQ, "MultienergyCTXRaySourceSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "MultienergyCTXRaySourceSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9366, 0x0018, 0x9366, - EVR_US, "XRaySourceIndex", 1, 1, "DICOM/Supplement_188", + EVR_US, "XRaySourceIndex", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9367, 0x0018, 0x9367, - EVR_UC, "XRaySourceID", 1, 1, "DICOM/Supplement_188", + EVR_UC, "XRaySourceID", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9368, 0x0018, 0x9368, - EVR_CS, "MultienergySourceTechnique", 1, 1, "DICOM/Supplement_188", + EVR_CS, "MultienergySourceTechnique", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9369, 0x0018, 0x9369, - EVR_DT, "SourceStartDateTime", 1, 1, "DICOM/Supplement_188", + EVR_DT, "SourceStartDateTime", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x936a, 0x0018, 0x936a, - EVR_DT, "SourceEndDateTime", 1, 1, "DICOM/Supplement_188", + EVR_DT, "SourceEndDateTime", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x936b, 0x0018, 0x936b, - EVR_US, "SwitchingPhaseNumber", 1, 1, "DICOM/Supplement_188", + EVR_US, "SwitchingPhaseNumber", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x936c, 0x0018, 0x936c, - EVR_DS, "SwitchingPhaseNominalDuration", 1, 1, "DICOM/Supplement_188", + EVR_DS, "SwitchingPhaseNominalDuration", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x936d, 0x0018, 0x936d, - EVR_DS, "SwitchingPhaseTransitionDuration", 1, 1, "DICOM/Supplement_188", + EVR_DS, "SwitchingPhaseTransitionDuration", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x936e, 0x0018, 0x936e, - EVR_DS, "EffectiveBinEnergy", 1, 1, "DICOM/Supplement_188", + EVR_DS, "EffectiveBinEnergy", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x936f, 0x0018, 0x936f, - EVR_SQ, "MultienergyCTXRayDetectorSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "MultienergyCTXRayDetectorSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9370, 0x0018, 0x9370, - EVR_US, "XRayDetectorIndex", 1, 1, "DICOM/Supplement_188", + EVR_US, "XRayDetectorIndex", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9371, 0x0018, 0x9371, - EVR_UC, "XRayDetectorID", 1, 1, "DICOM/Supplement_188", + EVR_UC, "XRayDetectorID", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9372, 0x0018, 0x9372, - EVR_CS, "MultienergyDetectorType", 1, 1, "DICOM/Supplement_188", + EVR_CS, "MultienergyDetectorType", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9373, 0x0018, 0x9373, - EVR_ST, "XRayDetectorLabel", 1, 1, "DICOM/Supplement_188", + EVR_ST, "XRayDetectorLabel", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9374, 0x0018, 0x9374, - EVR_DS, "NominalMaxEnergy", 1, 1, "DICOM/Supplement_188", + EVR_DS, "NominalMaxEnergy", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9375, 0x0018, 0x9375, - EVR_DS, "NominalMinEnergy", 1, 1, "DICOM/Supplement_188", + EVR_DS, "NominalMinEnergy", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9376, 0x0018, 0x9376, - EVR_US, "ReferencedXRayDetectorIndex", 1, -1, "DICOM/Supplement_188", + EVR_US, "ReferencedXRayDetectorIndex", 1, -1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9377, 0x0018, 0x9377, - EVR_US, "ReferencedXRaySourceIndex", 1, -1, "DICOM/Supplement_188", + EVR_US, "ReferencedXRaySourceIndex", 1, -1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9378, 0x0018, 0x9378, - EVR_US, "ReferencedPathIndex", 1, -1, "DICOM/Supplement_188", + EVR_US, "ReferencedPathIndex", 1, -1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9379, 0x0018, 0x9379, - EVR_SQ, "MultienergyCTPathSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "MultienergyCTPathSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x937a, 0x0018, 0x937a, - EVR_US, "MultienergyCTPathIndex", 1, 1, "DICOM/Supplement_188", + EVR_US, "MultienergyCTPathIndex", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x937b, 0x0018, 0x937b, - EVR_UT, "MultienergyAcquisitionDescription", 1, 1, "DICOM/Supplement_188", + EVR_UT, "MultienergyAcquisitionDescription", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x937c, 0x0018, 0x937c, - EVR_FD, "MonoenergeticEnergyEquivalent", 1, 1, "DICOM/Supplement_188", + EVR_FD, "MonoenergeticEnergyEquivalent", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x937d, 0x0018, 0x937d, - EVR_SQ, "MaterialCodeSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "MaterialCodeSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x937e, 0x0018, 0x937e, - EVR_CS, "DecompositionMethod", 1, 1, "DICOM/Supplement_188", + EVR_CS, "DecompositionMethod", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x937f, 0x0018, 0x937f, - EVR_UT, "DecompositionDescription", 1, 1, "DICOM/Supplement_188", + EVR_UT, "DecompositionDescription", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9380, 0x0018, 0x9380, - EVR_SQ, "DecompositionAlgorithmIdentificationSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "DecompositionAlgorithmIdentificationSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9381, 0x0018, 0x9381, - EVR_SQ, "DecompositionMaterialSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "DecompositionMaterialSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9382, 0x0018, 0x9382, - EVR_SQ, "MaterialAttenuationSequence", 1, 1, "DICOM/Supplement_188", + EVR_SQ, "MaterialAttenuationSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9383, 0x0018, 0x9383, - EVR_DS, "PhotonEnergy", 1, 1, "DICOM/Supplement_188", + EVR_DS, "PhotonEnergy", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9384, 0x0018, 0x9384, - EVR_DS, "XRayMassAttenuationCoefficient", 1, 1, "DICOM/Supplement_188", + EVR_DS, "XRayMassAttenuationCoefficient", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0018, 0x9401, 0x0018, 0x9401, @@ -10254,7 +10716,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00a7, 0x0019, 0x00a7, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData0", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00a7, 0x0019, 0x00a7, @@ -10274,7 +10736,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00a8, 0x0019, 0x00a8, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData1", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00a8, 0x0019, 0x00a8, @@ -10298,7 +10760,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00a9, 0x0019, 0x00a9, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData2", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00a9, 0x0019, 0x00a9, @@ -10318,7 +10780,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00aa, 0x0019, 0x00aa, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData3", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00aa, 0x0019, 0x00aa, @@ -10338,7 +10800,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00ab, 0x0019, 0x00ab, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData4", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00ab, 0x0019, 0x00ab, @@ -10358,7 +10820,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00ac, 0x0019, 0x00ac, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData5", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00ac, 0x0019, 0x00ac, @@ -10378,7 +10840,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00ad, 0x0019, 0x00ad, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData6", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00ad, 0x0019, 0x00ad, @@ -10398,7 +10860,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00ae, 0x0019, 0x00ae, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData7", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00ae, 0x0019, 0x00ae, @@ -10410,7 +10872,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00af, 0x0019, 0x00af, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData8", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00af, 0x0019, 0x00af, @@ -10426,7 +10888,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00b0, 0x0019, 0x00b0, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData9", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b0, 0x0019, 0x00b0, @@ -10454,7 +10916,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00b1, 0x0019, 0x00b1, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData10", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b1, 0x0019, 0x00b1, @@ -10474,7 +10936,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00b2, 0x0019, 0x00b2, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData11", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b3, 0x0019, 0x00b3, @@ -10490,7 +10952,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00b3, 0x0019, 0x00b3, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData12", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b4, 0x0019, 0x00b4, @@ -10506,7 +10968,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00b4, 0x0019, 0x00b4, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData13", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b5, 0x0019, 0x00b5, @@ -10522,7 +10984,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00b5, 0x0019, 0x00b5, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData14", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b6, 0x0019, 0x00b6, @@ -10534,7 +10996,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "DIDI TO PCR 1.1" } , { 0x0019, 0x00b6, 0x0019, 0x00b6, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData15", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b7, 0x0019, 0x00b7, @@ -10542,7 +11004,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS RA PLANE A" } , { 0x0019, 0x00b7, 0x0019, 0x00b7, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData16", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b8, 0x0019, 0x00b8, @@ -10550,7 +11012,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS RA PLANE A" } , { 0x0019, 0x00b8, 0x0019, 0x00b8, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData17", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00b9, 0x0019, 0x00b9, @@ -10558,11 +11020,11 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS RA PLANE A" } , { 0x0019, 0x00b9, 0x0019, 0x00b9, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData18", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00ba, 0x0019, 0x00ba, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData19", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00bb, 0x0019, 0x00bb, @@ -10570,7 +11032,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS RA PLANE A" } , { 0x0019, 0x00bb, 0x0019, 0x00bb, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData20", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00bc, 0x0019, 0x00bc, @@ -10578,7 +11040,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS RA PLANE A" } , { 0x0019, 0x00bc, 0x0019, 0x00bc, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData21", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00bd, 0x0019, 0x00bd, @@ -10586,7 +11048,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS RA PLANE A" } , { 0x0019, 0x00bd, 0x0019, 0x00bd, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData22", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00bd, 0x0019, 0x00bd, @@ -10986,7 +11448,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS RA PLANE A" } , { 0x0019, 0x00df, 0x0019, 0x00df, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData23", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00e0, 0x0019, 0x00e0, @@ -10998,7 +11460,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS RA PLANE A" } , { 0x0019, 0x00e0, 0x0019, 0x00e0, - EVR_DS, "UserData", 1, 1, "PrivateTag", + EVR_DS, "UserData24", 1, 1, "PrivateTag", DcmDictRange_Unspecified, DcmDictRange_Unspecified, "GEMS_ACQU_01" } , { 0x0019, 0x00e1, 0x0019, 0x00e1, @@ -13261,7 +13723,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0022, 0x1036, 0x0022, 0x1036, - EVR_SQ, "SourceOfCornealSizeDataCodeSequence", 1, 1, "DICOM/CP_1803", + EVR_SQ, "SourceOfCornealSizeDataCodeSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0022, 0x1037, 0x0022, 0x1037, @@ -13280,6 +13742,34 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_SQ, "OphthalmicUltrasoundMethodCodeSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0022, 0x1045, 0x0022, 0x1045, + EVR_SQ, "SurgicallyInducedAstigmatismSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0022, 0x1046, 0x0022, 0x1046, + EVR_CS, "TypeOfOpticalCorrection", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0022, 0x1047, 0x0022, 0x1047, + EVR_SQ, "ToricIOLPowerSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0022, 0x1048, 0x0022, 0x1048, + EVR_SQ, "PredictedToricErrorSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0022, 0x1049, 0x0022, 0x1049, + EVR_CS, "PreSelectedForImplantation", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0022, 0x104a, 0x0022, 0x104a, + EVR_SQ, "ToricIOLPowerForExactEmmetropiaSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0022, 0x104b, 0x0022, 0x104b, + EVR_SQ, "ToricIOLPowerForExactTargetRefractionSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x0022, 0x1050, 0x0022, 0x1050, EVR_SQ, "OphthalmicAxialLengthMeasurementsSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -13364,6 +13854,18 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_SQ, "AnteriorChamberDepthSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0022, 0x112a, 0x0022, 0x112a, + EVR_SQ, "CalculationCommentSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0022, 0x112b, 0x0022, 0x112b, + EVR_CS, "CalculationCommentType", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0022, 0x112c, 0x0022, 0x112c, + EVR_LT, "CalculationComment", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x0022, 0x1130, 0x0022, 0x1130, EVR_FL, "LensThickness", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -17646,6 +18148,14 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_SQ, "RequestedProcedureCodeSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0032, 0x1066, 0x0032, 0x1066, + EVR_UT, "ReasonForVisit", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0032, 0x1067, 0x0032, 0x1067, + EVR_SQ, "ReasonForVisitCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x0032, 0x1070, 0x0032, 0x1070, EVR_LO, "RequestedContrastAgent", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -18943,7 +19453,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0040, 0xa136, 0x0040, 0xa136, - EVR_US, "ReferencedFrameNumbers", 1, -1, "DICOM", + EVR_US, "RETIRED_ReferencedFrameNumbers", 1, -1, "DICOM/retired", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0040, 0xa138, 0x0040, 0xa138, @@ -19468,6 +19978,10 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_LO, "ListOfMIMETypes", 1, -1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0042, 0x0015, 0x0042, 0x0015, + EVR_UL, "EncapsulatedDocumentLength", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } #ifdef ENABLE_PRIVATE_TAGS , { 0x0043, 0x0001, 0x0043, 0x0001, EVR_SS, "BitmapOfPrescanOptions", 1, 1, "PrivateTag", @@ -20265,7 +20779,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0046, 0x0047, 0x0046, 0x0047, - EVR_SQ, "CornealSizeSequence", 1, 1, "DICOM/CP_1803", + EVR_SQ, "CornealSizeSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x0046, 0x0050, 0x0046, 0x0050, @@ -20360,6 +20874,42 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_FD, "ViewingDistance", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0046, 0x0110, 0x0046, 0x0110, + EVR_SQ, "CorneaMeasurementsSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0046, 0x0111, 0x0046, 0x0111, + EVR_SQ, "SourceOfCorneaMeasurementDataCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0046, 0x0112, 0x0046, 0x0112, + EVR_SQ, "SteepCornealAxisSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0046, 0x0113, 0x0046, 0x0113, + EVR_SQ, "FlatCornealAxisSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0046, 0x0114, 0x0046, 0x0114, + EVR_FD, "CornealPower", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0046, 0x0115, 0x0046, 0x0115, + EVR_FD, "CornealAxis", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0046, 0x0116, 0x0046, 0x0116, + EVR_SQ, "CorneaMeasurementMethodCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0046, 0x0117, 0x0046, 0x0117, + EVR_FL, "RefractiveIndexOfCornea", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0046, 0x0118, 0x0046, 0x0118, + EVR_FL, "RefractiveIndexOfAqueousHumor", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x0046, 0x0121, 0x0046, 0x0121, EVR_SQ, "VisualAcuityTypeCodeSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -20930,6 +21480,10 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_LO, "DeviceDescription", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0050, 0x0021, 0x0050, 0x0021, + EVR_ST, "LongDeviceDescription", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } #ifdef ENABLE_PRIVATE_TAGS , { 0x0051, 0x0010, 0x0051, 0x0010, EVR_LT, "ImageText", 1, -1, "PrivateTag", @@ -24128,6 +24682,14 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_SQ, "ModifiedAttributesSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x0400, 0x0551, 0x0400, 0x0551, + EVR_SQ, "NonconformingModifiedAttributesSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x0400, 0x0552, 0x0400, 0x0552, + EVR_OB, "NonconformingDataElementValue", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x0400, 0x0561, 0x0400, 0x0561, EVR_SQ, "OriginalAttributesSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -25628,6 +26190,18 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_LO, "FrameOfReferenceTransformationComment", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } + , { 0x3006, 0x00c9, 0x3006, 0x00c9, + EVR_SQ, "PatientLocationCoordinatesSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3006, 0x00ca, 0x3006, 0x00ca, + EVR_SQ, "PatientLocationCoordinatesCodeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3006, 0x00cb, 0x3006, 0x00cb, + EVR_SQ, "PatientSupportPositionSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x3008, 0x0010, 0x3008, 0x0010, EVR_SQ, "MeasuredDoseReferenceSequence", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, @@ -27608,388 +28182,1472 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { EVR_CS, "ReferenceDoseDefinition", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0002, 0x300c, 0x0002, - EVR_SQ, "ReferencedRTPlanSequence", 1, 1, "DICOM", + , { 0x300a, 0x0600, 0x300a, 0x0600, + EVR_US, "RTControlPointIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0004, 0x300c, 0x0004, - EVR_SQ, "ReferencedBeamSequence", 1, 1, "DICOM", + , { 0x300a, 0x0601, 0x300a, 0x0601, + EVR_US, "RadiationGenerationModeIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0006, 0x300c, 0x0006, - EVR_IS, "ReferencedBeamNumber", 1, 1, "DICOM", + , { 0x300a, 0x0602, 0x300a, 0x0602, + EVR_US, "ReferencedDefinedDeviceIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0007, 0x300c, 0x0007, - EVR_IS, "ReferencedReferenceImageNumber", 1, 1, "DICOM", + , { 0x300a, 0x0603, 0x300a, 0x0603, + EVR_US, "RadiationDoseIdentificationIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0008, 0x300c, 0x0008, - EVR_DS, "StartCumulativeMetersetWeight", 1, 1, "DICOM", + , { 0x300a, 0x0604, 0x300a, 0x0604, + EVR_US, "NumberOfRTControlPoints", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0009, 0x300c, 0x0009, - EVR_DS, "EndCumulativeMetersetWeight", 1, 1, "DICOM", + , { 0x300a, 0x0605, 0x300a, 0x0605, + EVR_US, "ReferencedRadiationGenerationModeIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x000a, 0x300c, 0x000a, - EVR_SQ, "ReferencedBrachyApplicationSetupSequence", 1, 1, "DICOM", + , { 0x300a, 0x0606, 0x300a, 0x0606, + EVR_US, "TreatmentPositionIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x000c, 0x300c, 0x000c, - EVR_IS, "ReferencedBrachyApplicationSetupNumber", 1, 1, "DICOM", + , { 0x300a, 0x0607, 0x300a, 0x0607, + EVR_US, "ReferencedDeviceIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x000e, 0x300c, 0x000e, - EVR_IS, "ReferencedSourceNumber", 1, 1, "DICOM", + , { 0x300a, 0x0608, 0x300a, 0x0608, + EVR_LO, "TreatmentPositionGroupLabel", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0020, 0x300c, 0x0020, - EVR_SQ, "ReferencedFractionGroupSequence", 1, 1, "DICOM", + , { 0x300a, 0x0609, 0x300a, 0x0609, + EVR_UI, "TreatmentPositionGroupUID", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0022, 0x300c, 0x0022, - EVR_IS, "ReferencedFractionGroupNumber", 1, 1, "DICOM", + , { 0x300a, 0x060a, 0x300a, 0x060a, + EVR_SQ, "TreatmentPositionGroupSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0040, 0x300c, 0x0040, - EVR_SQ, "ReferencedVerificationImageSequence", 1, 1, "DICOM", + , { 0x300a, 0x060b, 0x300a, 0x060b, + EVR_US, "ReferencedTreatmentPositionIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0042, 0x300c, 0x0042, - EVR_SQ, "ReferencedReferenceImageSequence", 1, 1, "DICOM", + , { 0x300a, 0x060c, 0x300a, 0x060c, + EVR_US, "ReferencedRadiationDoseIdentificationIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0050, 0x300c, 0x0050, - EVR_SQ, "ReferencedDoseReferenceSequence", 1, 1, "DICOM", + , { 0x300a, 0x060d, 0x300a, 0x060d, + EVR_FD, "RTAccessoryHolderWaterEquivalentThickness", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0051, 0x300c, 0x0051, - EVR_IS, "ReferencedDoseReferenceNumber", 1, 1, "DICOM", + , { 0x300a, 0x060e, 0x300a, 0x060e, + EVR_US, "ReferencedRTAccessoryHolderDeviceIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0055, 0x300c, 0x0055, - EVR_SQ, "BrachyReferencedDoseReferenceSequence", 1, 1, "DICOM", + , { 0x300a, 0x060f, 0x300a, 0x060f, + EVR_CS, "RTAccessoryHolderSlotExistenceFlag", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0060, 0x300c, 0x0060, - EVR_SQ, "ReferencedStructureSetSequence", 1, 1, "DICOM", + , { 0x300a, 0x0610, 0x300a, 0x0610, + EVR_SQ, "RTAccessoryHolderSlotSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x006a, 0x300c, 0x006a, - EVR_IS, "ReferencedPatientSetupNumber", 1, 1, "DICOM", + , { 0x300a, 0x0611, 0x300a, 0x0611, + EVR_LO, "RTAccessoryHolderSlotID", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0080, 0x300c, 0x0080, - EVR_SQ, "ReferencedDoseSequence", 1, 1, "DICOM", + , { 0x300a, 0x0612, 0x300a, 0x0612, + EVR_FD, "RTAccessoryHolderSlotDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00a0, 0x300c, 0x00a0, - EVR_IS, "ReferencedToleranceTableNumber", 1, 1, "DICOM", + , { 0x300a, 0x0613, 0x300a, 0x0613, + EVR_FD, "RTAccessorySlotDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00b0, 0x300c, 0x00b0, - EVR_SQ, "ReferencedBolusSequence", 1, 1, "DICOM", + , { 0x300a, 0x0614, 0x300a, 0x0614, + EVR_SQ, "RTAccessoryHolderDefinitionSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00c0, 0x300c, 0x00c0, - EVR_IS, "ReferencedWedgeNumber", 1, 1, "DICOM", + , { 0x300a, 0x0615, 0x300a, 0x0615, + EVR_LO, "RTAccessoryDeviceSlotID", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00d0, 0x300c, 0x00d0, - EVR_IS, "ReferencedCompensatorNumber", 1, 1, "DICOM", + , { 0x300a, 0x0616, 0x300a, 0x0616, + EVR_SQ, "RTRadiationSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00e0, 0x300c, 0x00e0, - EVR_IS, "ReferencedBlockNumber", 1, 1, "DICOM", + , { 0x300a, 0x0617, 0x300a, 0x0617, + EVR_SQ, "RadiationDoseSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00f0, 0x300c, 0x00f0, - EVR_IS, "ReferencedControlPointIndex", 1, 1, "DICOM", + , { 0x300a, 0x0618, 0x300a, 0x0618, + EVR_SQ, "RadiationDoseIdentificationSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00f2, 0x300c, 0x00f2, - EVR_SQ, "ReferencedControlPointSequence", 1, 1, "DICOM", + , { 0x300a, 0x0619, 0x300a, 0x0619, + EVR_LO, "RadiationDoseIdentificationLabel", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00f4, 0x300c, 0x00f4, - EVR_IS, "ReferencedStartControlPointIndex", 1, 1, "DICOM", + , { 0x300a, 0x061a, 0x300a, 0x061a, + EVR_CS, "ReferenceDoseType", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x00f6, 0x300c, 0x00f6, - EVR_IS, "ReferencedStopControlPointIndex", 1, 1, "DICOM", + , { 0x300a, 0x061b, 0x300a, 0x061b, + EVR_CS, "PrimaryDoseValueIndicator", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0100, 0x300c, 0x0100, - EVR_IS, "ReferencedRangeShifterNumber", 1, 1, "DICOM", + , { 0x300a, 0x061c, 0x300a, 0x061c, + EVR_SQ, "DoseValuesSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0102, 0x300c, 0x0102, - EVR_IS, "ReferencedLateralSpreadingDeviceNumber", 1, 1, "DICOM", + , { 0x300a, 0x061d, 0x300a, 0x061d, + EVR_CS, "DoseValuePurpose", 1, -1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0104, 0x300c, 0x0104, - EVR_IS, "ReferencedRangeModulatorNumber", 1, 1, "DICOM", + , { 0x300a, 0x061e, 0x300a, 0x061e, + EVR_FD, "ReferenceDosePointCoordinates", 3, 3, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0111, 0x300c, 0x0111, - EVR_SQ, "OmittedBeamTaskSequence", 1, 1, "DICOM", + , { 0x300a, 0x061f, 0x300a, 0x061f, + EVR_SQ, "RadiationDoseValuesParametersSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0112, 0x300c, 0x0112, - EVR_CS, "ReasonForOmission", 1, 1, "DICOM", + , { 0x300a, 0x0620, 0x300a, 0x0620, + EVR_SQ, "MetersetToDoseMappingSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300c, 0x0113, 0x300c, 0x0113, - EVR_LO, "ReasonForOmissionDescription", 1, 1, "DICOM", + , { 0x300a, 0x0621, 0x300a, 0x0621, + EVR_SQ, "ExpectedInVivoMeasurementValuesSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300e, 0x0002, 0x300e, 0x0002, - EVR_CS, "ApprovalStatus", 1, 1, "DICOM", + , { 0x300a, 0x0622, 0x300a, 0x0622, + EVR_US, "ExpectedInVivoMeasurementValueIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300e, 0x0004, 0x300e, 0x0004, - EVR_DA, "ReviewDate", 1, 1, "DICOM", + , { 0x300a, 0x0623, 0x300a, 0x0623, + EVR_LO, "RadiationDoseInVivoMeasurementLabel", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300e, 0x0005, 0x300e, 0x0005, - EVR_TM, "ReviewTime", 1, 1, "DICOM", + , { 0x300a, 0x0624, 0x300a, 0x0624, + EVR_FD, "RadiationDoseCentralAxisDisplacement", 2, 2, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x300e, 0x0008, 0x300e, 0x0008, - EVR_PN, "ReviewerName", 1, 1, "DICOM", + , { 0x300a, 0x0625, 0x300a, 0x0625, + EVR_FD, "RadiationDoseValue", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } -#ifdef ENABLE_PRIVATE_TAGS - , { 0x3f01, 0x0001, 0x3f01, 0x0001, - EVR_LO, "InstitutionCode", 1, 1, "PrivateTag", + , { 0x300a, 0x0626, 0x300a, 0x0626, + EVR_FD, "RadiationDoseSourceToSkinDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "INTELERAD MEDICAL SYSTEMS" } - , { 0x3f01, 0x0002, 0x3f01, 0x0002, - EVR_LO, "RoutedTransferAE", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x0627, 0x300a, 0x0627, + EVR_FD, "RadiationDoseMeasurementPointCoordinates", 3, 3, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "INTELERAD MEDICAL SYSTEMS" } - , { 0x3f01, 0x0003, 0x3f01, 0x0003, - EVR_LO, "SourceAE", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x0628, 0x300a, 0x0628, + EVR_FD, "RadiationDoseSourceToExternalContourDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "INTELERAD MEDICAL SYSTEMS" } - , { 0x3f01, 0x0004, 0x3f01, 0x0004, - EVR_SH, "DeferredValidation", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x0629, 0x300a, 0x0629, + EVR_SQ, "RTToleranceSetSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "INTELERAD MEDICAL SYSTEMS" } - , { 0x3f01, 0x0005, 0x3f01, 0x0005, - EVR_LO, "SeriesOwner", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x062a, 0x300a, 0x062a, + EVR_LO, "RTToleranceSetLabel", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "INTELERAD MEDICAL SYSTEMS" } - , { 0x3f01, 0x0006, 0x3f01, 0x0006, - EVR_LO, "OrderGroupNumber", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x062b, 0x300a, 0x062b, + EVR_SQ, "AttributeToleranceValuesSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "INTELERAD MEDICAL SYSTEMS" } - , { 0x3f01, 0x0007, 0x3f01, 0x0007, - EVR_SH, "StrippedPixelData", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x062c, 0x300a, 0x062c, + EVR_FD, "ToleranceValue", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "INTELERAD MEDICAL SYSTEMS" } - , { 0x3f01, 0x0008, 0x3f01, 0x0008, - EVR_SH, "PendingMoveRequest", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x062d, 0x300a, 0x062d, + EVR_SQ, "PatientSupportPositionToleranceSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "INTELERAD MEDICAL SYSTEMS" } -#endif - , { 0x4000, 0x0010, 0x4000, 0x0010, - EVR_LT, "RETIRED_Arbitrary", 1, 1, "DICOM/retired", + NULL } + , { 0x300a, 0x062e, 0x300a, 0x062e, + EVR_FD, "TreatmentTimeLimit", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4000, 0x4000, 0x4000, 0x4000, - EVR_LT, "RETIRED_TextComments", 1, 1, "DICOM/retired", + , { 0x300a, 0x062f, 0x300a, 0x062f, + EVR_SQ, "CArmPhotonElectronControlPointSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0040, 0x4008, 0x0040, - EVR_SH, "RETIRED_ResultsID", 1, 1, "DICOM/retired", + , { 0x300a, 0x0630, 0x300a, 0x0630, + EVR_SQ, "ReferencedRTRadiationSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0042, 0x4008, 0x0042, - EVR_LO, "RETIRED_ResultsIDIssuer", 1, 1, "DICOM/retired", + , { 0x300a, 0x0631, 0x300a, 0x0631, + EVR_SQ, "ReferencedRTInstanceSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0050, 0x4008, 0x0050, - EVR_SQ, "RETIRED_ReferencedInterpretationSequence", 1, 1, "DICOM/retired", + , { 0x300a, 0x0632, 0x300a, 0x0632, + EVR_SQ, "ReferencedRTPatientSetupSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x00ff, 0x4008, 0x00ff, - EVR_CS, "RETIRED_ReportProductionStatusTrial", 1, 1, "DICOM/retired", + , { 0x300a, 0x0634, 0x300a, 0x0634, + EVR_FD, "SourceToPatientSurfaceDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0100, 0x4008, 0x0100, - EVR_DA, "RETIRED_InterpretationRecordedDate", 1, 1, "DICOM/retired", + , { 0x300a, 0x0635, 0x300a, 0x0635, + EVR_SQ, "TreatmentMachineSpecialModeCodeSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0101, 0x4008, 0x0101, - EVR_TM, "RETIRED_InterpretationRecordedTime", 1, 1, "DICOM/retired", + , { 0x300a, 0x0636, 0x300a, 0x0636, + EVR_US, "IntendedNumberOfFractions", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0102, 0x4008, 0x0102, - EVR_PN, "RETIRED_InterpretationRecorder", 1, 1, "DICOM/retired", + , { 0x300a, 0x0637, 0x300a, 0x0637, + EVR_CS, "RTRadiationSetIntent", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0103, 0x4008, 0x0103, - EVR_LO, "RETIRED_ReferenceToRecordedSound", 1, 1, "DICOM/retired", + , { 0x300a, 0x0638, 0x300a, 0x0638, + EVR_CS, "RTRadiationPhysicalAndGeometricContentDetailFlag", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0108, 0x4008, 0x0108, - EVR_DA, "RETIRED_InterpretationTranscriptionDate", 1, 1, "DICOM/retired", + , { 0x300a, 0x0639, 0x300a, 0x0639, + EVR_CS, "RTRecordFlag", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0109, 0x4008, 0x0109, - EVR_TM, "RETIRED_InterpretationTranscriptionTime", 1, 1, "DICOM/retired", + , { 0x300a, 0x063a, 0x300a, 0x063a, + EVR_SQ, "TreatmentDeviceIdentificationSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x010a, 0x4008, 0x010a, - EVR_PN, "RETIRED_InterpretationTranscriber", 1, 1, "DICOM/retired", + , { 0x300a, 0x063b, 0x300a, 0x063b, + EVR_SQ, "ReferencedRTPhysicianIntentSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x010b, 0x4008, 0x010b, - EVR_ST, "RETIRED_InterpretationText", 1, 1, "DICOM/retired", + , { 0x300a, 0x063c, 0x300a, 0x063c, + EVR_FD, "CumulativeMeterset", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x010c, 0x4008, 0x010c, - EVR_PN, "RETIRED_InterpretationAuthor", 1, 1, "DICOM/retired", + , { 0x300a, 0x063d, 0x300a, 0x063d, + EVR_FD, "DeliveryRate", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0111, 0x4008, 0x0111, - EVR_SQ, "RETIRED_InterpretationApproverSequence", 1, 1, "DICOM/retired", + , { 0x300a, 0x063e, 0x300a, 0x063e, + EVR_SQ, "DeliveryRateUnitSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0112, 0x4008, 0x0112, - EVR_DA, "RETIRED_InterpretationApprovalDate", 1, 1, "DICOM/retired", + , { 0x300a, 0x063f, 0x300a, 0x063f, + EVR_SQ, "TreatmentPositionSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0113, 0x4008, 0x0113, - EVR_TM, "RETIRED_InterpretationApprovalTime", 1, 1, "DICOM/retired", + , { 0x300a, 0x0640, 0x300a, 0x0640, + EVR_FD, "RadiationSourceAxisDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0114, 0x4008, 0x0114, - EVR_PN, "RETIRED_PhysicianApprovingInterpretation", 1, 1, "DICOM/retired", + , { 0x300a, 0x0641, 0x300a, 0x0641, + EVR_US, "NumberOfRTBeamLimitingDevices", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0115, 0x4008, 0x0115, - EVR_LT, "RETIRED_InterpretationDiagnosisDescription", 1, 1, "DICOM/retired", + , { 0x300a, 0x0642, 0x300a, 0x0642, + EVR_FD, "RTBeamLimitingDeviceProximalDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0117, 0x4008, 0x0117, - EVR_SQ, "RETIRED_InterpretationDiagnosisCodeSequence", 1, 1, "DICOM/retired", + , { 0x300a, 0x0643, 0x300a, 0x0643, + EVR_FD, "RTBeamLimitingDeviceDistalDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0118, 0x4008, 0x0118, - EVR_SQ, "RETIRED_ResultsDistributionListSequence", 1, 1, "DICOM/retired", + , { 0x300a, 0x0644, 0x300a, 0x0644, + EVR_SQ, "ParallelRTBeamDelimiterDeviceOrientationLabelCodeSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0119, 0x4008, 0x0119, - EVR_PN, "RETIRED_DistributionName", 1, 1, "DICOM/retired", + , { 0x300a, 0x0645, 0x300a, 0x0645, + EVR_FD, "BeamsModifierOrientationAngle", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x011a, 0x4008, 0x011a, - EVR_LO, "RETIRED_DistributionAddress", 1, 1, "DICOM/retired", + , { 0x300a, 0x0646, 0x300a, 0x0646, + EVR_SQ, "FixedRTBeamDelimiterDeviceSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0200, 0x4008, 0x0200, - EVR_SH, "RETIRED_InterpretationID", 1, 1, "DICOM/retired", + , { 0x300a, 0x0647, 0x300a, 0x0647, + EVR_SQ, "ParallelRTBeamDelimiterDeviceSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0202, 0x4008, 0x0202, - EVR_LO, "RETIRED_InterpretationIDIssuer", 1, 1, "DICOM/retired", + , { 0x300a, 0x0648, 0x300a, 0x0648, + EVR_US, "NumberOfParallelRTBeamDelimiters", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0210, 0x4008, 0x0210, - EVR_CS, "RETIRED_InterpretationTypeID", 1, 1, "DICOM/retired", + , { 0x300a, 0x0649, 0x300a, 0x0649, + EVR_FD, "ParallelRTBeamDelimiterBoundaries", 2, -1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0212, 0x4008, 0x0212, - EVR_CS, "RETIRED_InterpretationStatusID", 1, 1, "DICOM/retired", + , { 0x300a, 0x064a, 0x300a, 0x064a, + EVR_FD, "ParallelRTBeamDelimiterPositions", 2, -1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x0300, 0x4008, 0x0300, - EVR_ST, "RETIRED_Impressions", 1, 1, "DICOM/retired", + , { 0x300a, 0x064b, 0x300a, 0x064b, + EVR_FD, "RTBeamLimitingDeviceOffset", 2, 2, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4008, 0x4000, 0x4008, 0x4000, - EVR_ST, "RETIRED_ResultsComments", 1, 1, "DICOM/retired", + , { 0x300a, 0x064c, 0x300a, 0x064c, + EVR_SQ, "RTBeamDelimiterGeometrySequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } -#ifdef ENABLE_PRIVATE_TAGS - , { 0x4009, 0x0001, 0x4009, 0x0001, - EVR_LT, "ReportID", 1, 1, "PrivateTag", + , { 0x300a, 0x064d, 0x300a, 0x064d, + EVR_SQ, "RTBeamLimitingDeviceDefinitionSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "SIEMENS ISI" } - , { 0x4009, 0x0020, 0x4009, 0x0020, - EVR_LT, "ReportStatus", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x064e, 0x300a, 0x064e, + EVR_CS, "ParallelRTBeamDelimiterOpeningMode", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "SIEMENS ISI" } - , { 0x4009, 0x0030, 0x4009, 0x0030, - EVR_DA, "ReportCreationDate", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x064f, 0x300a, 0x064f, + EVR_CS, "ParallelRTBeamDelimiterLeafMountingSide", 1, -1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "SIEMENS ISI" } - , { 0x4009, 0x0070, 0x4009, 0x0070, - EVR_LT, "ReportApprovingPhysician", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x0650, 0x300a, 0x0650, + EVR_UI, "PatientSetupUID", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "SIEMENS ISI" } - , { 0x4009, 0x00e0, 0x4009, 0x00e0, - EVR_LT, "ReportText", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x0651, 0x300a, 0x0651, + EVR_SQ, "WedgeDefinitionSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "SIEMENS ISI" } - , { 0x4009, 0x00e1, 0x4009, 0x00e1, - EVR_LT, "ReportAuthor", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x0652, 0x300a, 0x0652, + EVR_FD, "RadiationBeamWedgeAngle", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "SIEMENS ISI" } - , { 0x4009, 0x00e3, 0x4009, 0x00e3, - EVR_LT, "ReportingRadiologist", 1, 1, "PrivateTag", + NULL } + , { 0x300a, 0x0653, 0x300a, 0x0653, + EVR_FD, "RadiationBeamWedgeThinEdgeDistance", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "SIEMENS ISI" } -#endif - , { 0x4010, 0x0001, 0x4010, 0x0001, - EVR_CS, "LowEnergyDetectors", 1, 1, "DICOM/DICOS", + NULL } + , { 0x300a, 0x0654, 0x300a, 0x0654, + EVR_FD, "RadiationBeamEffectiveWedgeAngle", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x0002, 0x4010, 0x0002, - EVR_CS, "HighEnergyDetectors", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x0655, 0x300a, 0x0655, + EVR_US, "NumberOfWedgePositions", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x0004, 0x4010, 0x0004, - EVR_SQ, "DetectorGeometrySequence", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x0656, 0x300a, 0x0656, + EVR_SQ, "RTBeamLimitingDeviceOpeningSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x1001, 0x4010, 0x1001, - EVR_SQ, "ThreatROIVoxelSequence", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x0657, 0x300a, 0x0657, + EVR_US, "NumberOfRTBeamLimitingDeviceOpenings", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x1004, 0x4010, 0x1004, - EVR_FL, "ThreatROIBase", 3, 3, "DICOM/DICOS", + , { 0x300a, 0x0658, 0x300a, 0x0658, + EVR_SQ, "RadiationDosimeterUnitSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x1005, 0x4010, 0x1005, - EVR_FL, "ThreatROIExtents", 3, 3, "DICOM/DICOS", + , { 0x300a, 0x0659, 0x300a, 0x0659, + EVR_SQ, "RTDeviceDistanceReferenceLocationCodeSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x1006, 0x4010, 0x1006, - EVR_OB, "ThreatROIBitmap", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x065a, 0x300a, 0x065a, + EVR_SQ, "RadiationDeviceConfigurationAndCommissioningKeySequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x1007, 0x4010, 0x1007, - EVR_SH, "RouteSegmentID", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x065b, 0x300a, 0x065b, + EVR_SQ, "PatientSupportPositionParameterSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x1008, 0x4010, 0x1008, - EVR_CS, "GantryType", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x065c, 0x300a, 0x065c, + EVR_CS, "PatientSupportPositionSpecificationMethod", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x1009, 0x4010, 0x1009, - EVR_CS, "OOIOwnerType", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x065d, 0x300a, 0x065d, + EVR_SQ, "PatientSupportPositionDeviceParameterSequence", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x100a, 0x4010, 0x100a, - EVR_SQ, "RouteSegmentSequence", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x065e, 0x300a, 0x065e, + EVR_US, "DeviceOrderIndex", 1, 1, "DICOM/Supplement_175", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } - , { 0x4010, 0x1010, 0x4010, 0x1010, - EVR_US, "PotentialThreatObjectID", 1, 1, "DICOM/DICOS", + , { 0x300a, 0x065f, 0x300a, 0x065f, + EVR_US, "PatientSupportPositionParameterOrderIndex", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0660, 0x300a, 0x0660, + EVR_SQ, "PatientSupportPositionDeviceToleranceSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0661, 0x300a, 0x0661, + EVR_US, "PatientSupportPositionToleranceOrderIndex", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0662, 0x300a, 0x0662, + EVR_SQ, "CompensatorDefinitionSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0663, 0x300a, 0x0663, + EVR_CS, "CompensatorMapOrientation", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0664, 0x300a, 0x0664, + EVR_OF, "CompensatorProximalThicknessMap", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0665, 0x300a, 0x0665, + EVR_OF, "CompensatorDistalThicknessMap", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0666, 0x300a, 0x0666, + EVR_FD, "CompensatorBasePlaneOffset", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0667, 0x300a, 0x0667, + EVR_SQ, "CompensatorShapeFabricationCodeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0668, 0x300a, 0x0668, + EVR_SQ, "CompensatorShapeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0669, 0x300a, 0x0669, + EVR_FD, "RadiationBeamCompensatorMillingToolDiameter", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x066a, 0x300a, 0x066a, + EVR_SQ, "BlockDefinitionSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x066b, 0x300a, 0x066b, + EVR_OF, "BlockEdgeData", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x066c, 0x300a, 0x066c, + EVR_CS, "BlockOrientation", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x066d, 0x300a, 0x066d, + EVR_FD, "RadiationBeamBlockThickness", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x066e, 0x300a, 0x066e, + EVR_FD, "RadiationBeamBlockSlabThickness", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x066f, 0x300a, 0x066f, + EVR_SQ, "BlockEdgeDataSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0670, 0x300a, 0x0670, + EVR_US, "NumberOfRTAccessoryHolders", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0671, 0x300a, 0x0671, + EVR_SQ, "GeneralAccessoryDefinitionSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0672, 0x300a, 0x0672, + EVR_US, "NumberOfGeneralAccessories", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0673, 0x300a, 0x0673, + EVR_SQ, "BolusDefinitionSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0674, 0x300a, 0x0674, + EVR_US, "NumberOfBoluses", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0675, 0x300a, 0x0675, + EVR_UI, "EquipmentFrameOfReferenceUID", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0676, 0x300a, 0x0676, + EVR_ST, "EquipmentFrameOfReferenceDescription", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0677, 0x300a, 0x0677, + EVR_SQ, "EquipmentReferencePointCoordinatesSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0678, 0x300a, 0x0678, + EVR_SQ, "EquipmentReferencePointCodeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0679, 0x300a, 0x0679, + EVR_FD, "RTBeamLimitingDeviceAngle", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x067a, 0x300a, 0x067a, + EVR_FD, "SourceRollAngle", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x067b, 0x300a, 0x067b, + EVR_SQ, "RadiationGenerationModeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x067c, 0x300a, 0x067c, + EVR_SH, "RadiationGenerationModeLabel", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x067d, 0x300a, 0x067d, + EVR_ST, "RadiationGenerationModeDescription", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x067e, 0x300a, 0x067e, + EVR_SQ, "RadiationGenerationModeMachineCodeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x067f, 0x300a, 0x067f, + EVR_SQ, "RadiationTypeCodeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0680, 0x300a, 0x0680, + EVR_DS, "NominalEnergy", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0681, 0x300a, 0x0681, + EVR_DS, "MinimumNominalEnergy", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0682, 0x300a, 0x0682, + EVR_DS, "MaximumNominalEnergy", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0683, 0x300a, 0x0683, + EVR_SQ, "RadiationFluenceModifierCodeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0684, 0x300a, 0x0684, + EVR_SQ, "EnergyUnitCodeSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0685, 0x300a, 0x0685, + EVR_US, "NumberOfRadiationGenerationModes", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0686, 0x300a, 0x0686, + EVR_SQ, "PatientSupportDevicesSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0687, 0x300a, 0x0687, + EVR_US, "NumberOfPatientSupportDevices", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0688, 0x300a, 0x0688, + EVR_FD, "RTBeamModifierDefinitionDistance", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300a, 0x0689, 0x300a, 0x0689, + EVR_SQ, "BeamAreaLimitSequence", 1, 1, "DICOM/Supplement_175", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0002, 0x300c, 0x0002, + EVR_SQ, "ReferencedRTPlanSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0004, 0x300c, 0x0004, + EVR_SQ, "ReferencedBeamSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0006, 0x300c, 0x0006, + EVR_IS, "ReferencedBeamNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0007, 0x300c, 0x0007, + EVR_IS, "ReferencedReferenceImageNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0008, 0x300c, 0x0008, + EVR_DS, "StartCumulativeMetersetWeight", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0009, 0x300c, 0x0009, + EVR_DS, "EndCumulativeMetersetWeight", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x000a, 0x300c, 0x000a, + EVR_SQ, "ReferencedBrachyApplicationSetupSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x000c, 0x300c, 0x000c, + EVR_IS, "ReferencedBrachyApplicationSetupNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x000e, 0x300c, 0x000e, + EVR_IS, "ReferencedSourceNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0020, 0x300c, 0x0020, + EVR_SQ, "ReferencedFractionGroupSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0022, 0x300c, 0x0022, + EVR_IS, "ReferencedFractionGroupNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0040, 0x300c, 0x0040, + EVR_SQ, "ReferencedVerificationImageSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0042, 0x300c, 0x0042, + EVR_SQ, "ReferencedReferenceImageSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0050, 0x300c, 0x0050, + EVR_SQ, "ReferencedDoseReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0051, 0x300c, 0x0051, + EVR_IS, "ReferencedDoseReferenceNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0055, 0x300c, 0x0055, + EVR_SQ, "BrachyReferencedDoseReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0060, 0x300c, 0x0060, + EVR_SQ, "ReferencedStructureSetSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x006a, 0x300c, 0x006a, + EVR_IS, "ReferencedPatientSetupNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0080, 0x300c, 0x0080, + EVR_SQ, "ReferencedDoseSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00a0, 0x300c, 0x00a0, + EVR_IS, "ReferencedToleranceTableNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00b0, 0x300c, 0x00b0, + EVR_SQ, "ReferencedBolusSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00c0, 0x300c, 0x00c0, + EVR_IS, "ReferencedWedgeNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00d0, 0x300c, 0x00d0, + EVR_IS, "ReferencedCompensatorNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00e0, 0x300c, 0x00e0, + EVR_IS, "ReferencedBlockNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00f0, 0x300c, 0x00f0, + EVR_IS, "ReferencedControlPointIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00f2, 0x300c, 0x00f2, + EVR_SQ, "ReferencedControlPointSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00f4, 0x300c, 0x00f4, + EVR_IS, "ReferencedStartControlPointIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x00f6, 0x300c, 0x00f6, + EVR_IS, "ReferencedStopControlPointIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0100, 0x300c, 0x0100, + EVR_IS, "ReferencedRangeShifterNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0102, 0x300c, 0x0102, + EVR_IS, "ReferencedLateralSpreadingDeviceNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0104, 0x300c, 0x0104, + EVR_IS, "ReferencedRangeModulatorNumber", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0111, 0x300c, 0x0111, + EVR_SQ, "OmittedBeamTaskSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0112, 0x300c, 0x0112, + EVR_CS, "ReasonForOmission", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300c, 0x0113, 0x300c, 0x0113, + EVR_LO, "ReasonForOmissionDescription", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300e, 0x0002, 0x300e, 0x0002, + EVR_CS, "ApprovalStatus", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300e, 0x0004, 0x300e, 0x0004, + EVR_DA, "ReviewDate", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300e, 0x0005, 0x300e, 0x0005, + EVR_TM, "ReviewTime", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x300e, 0x0008, 0x300e, 0x0008, + EVR_PN, "ReviewerName", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0001, 0x3010, 0x0001, + EVR_SQ, "RadiobiologicalDoseEffectSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0002, 0x3010, 0x0002, + EVR_CS, "RadiobiologicalDoseEffectFlag", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0003, 0x3010, 0x0003, + EVR_SQ, "EffectiveDoseCalculationMethodCategoryCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0004, 0x3010, 0x0004, + EVR_SQ, "EffectiveDoseCalculationMethodCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0005, 0x3010, 0x0005, + EVR_LO, "EffectiveDoseCalculationMethodDescription", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0006, 0x3010, 0x0006, + EVR_UI, "ConceptualVolumeUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0007, 0x3010, 0x0007, + EVR_SQ, "OriginatingSOPInstanceReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0008, 0x3010, 0x0008, + EVR_SQ, "ConceptualVolumeConstituentSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0009, 0x3010, 0x0009, + EVR_SQ, "EquivalentConceptualVolumeInstanceReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x000a, 0x3010, 0x000a, + EVR_SQ, "EquivalentConceptualVolumesSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x000b, 0x3010, 0x000b, + EVR_UI, "ReferencedConceptualVolumeUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x000c, 0x3010, 0x000c, + EVR_UT, "ConceptualVolumeCombinationExpression", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x000d, 0x3010, 0x000d, + EVR_US, "ConceptualVolumeConstituentIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x000e, 0x3010, 0x000e, + EVR_CS, "ConceptualVolumeCombinationFlag", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x000f, 0x3010, 0x000f, + EVR_ST, "ConceptualVolumeCombinationDescription", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0010, 0x3010, 0x0010, + EVR_CS, "ConceptualVolumeSegmentationDefinedFlag", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0011, 0x3010, 0x0011, + EVR_SQ, "ConceptualVolumeSegmentationReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0012, 0x3010, 0x0012, + EVR_SQ, "ConceptualVolumeConstituentSegmentationReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0013, 0x3010, 0x0013, + EVR_UI, "ConstituentConceptualVolumeUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0014, 0x3010, 0x0014, + EVR_SQ, "DerivationConceptualVolumeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0015, 0x3010, 0x0015, + EVR_UI, "SourceConceptualVolumeUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0016, 0x3010, 0x0016, + EVR_SQ, "ConceptualVolumeDerivationAlgorithmSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0017, 0x3010, 0x0017, + EVR_ST, "ConceptualVolumeDescription", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0018, 0x3010, 0x0018, + EVR_SQ, "SourceConceptualVolumeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0019, 0x3010, 0x0019, + EVR_SQ, "AuthorIdentificationSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x001a, 0x3010, 0x001a, + EVR_LO, "ManufacturerModelVersion", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x001b, 0x3010, 0x001b, + EVR_UC, "DeviceAlternateIdentifier", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x001c, 0x3010, 0x001c, + EVR_CS, "DeviceAlternateIdentifierType", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x001d, 0x3010, 0x001d, + EVR_LT, "DeviceAlternateIdentifierFormat", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x001e, 0x3010, 0x001e, + EVR_LO, "SegmentationCreationTemplateLabel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x001f, 0x3010, 0x001f, + EVR_UI, "SegmentationTemplateUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0020, 0x3010, 0x0020, + EVR_US, "ReferencedSegmentReferenceIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0021, 0x3010, 0x0021, + EVR_SQ, "SegmentReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0022, 0x3010, 0x0022, + EVR_US, "SegmentReferenceIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0023, 0x3010, 0x0023, + EVR_SQ, "DirectSegmentReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0024, 0x3010, 0x0024, + EVR_SQ, "CombinationSegmentReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0025, 0x3010, 0x0025, + EVR_SQ, "ConceptualVolumeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0026, 0x3010, 0x0026, + EVR_SQ, "SegmentedRTAccessoryDeviceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0027, 0x3010, 0x0027, + EVR_SQ, "SegmentCharacteristicsSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0028, 0x3010, 0x0028, + EVR_SQ, "RelatedSegmentCharacteristicsSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0029, 0x3010, 0x0029, + EVR_US, "SegmentCharacteristicsPrecedence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x002a, 0x3010, 0x002a, + EVR_SQ, "RTSegmentAnnotationSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x002b, 0x3010, 0x002b, + EVR_SQ, "SegmentAnnotationCategoryCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x002c, 0x3010, 0x002c, + EVR_SQ, "SegmentAnnotationTypeCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x002d, 0x3010, 0x002d, + EVR_LO, "DeviceLabel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x002e, 0x3010, 0x002e, + EVR_SQ, "DeviceTypeCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0030, 0x3010, 0x0030, + EVR_SQ, "PatientEquipmentRelationshipCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0031, 0x3010, 0x0031, + EVR_UI, "ReferencedFiducialsUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0032, 0x3010, 0x0032, + EVR_SQ, "PatientTreatmentOrientationSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0033, 0x3010, 0x0033, + EVR_SH, "UserContentLabel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0034, 0x3010, 0x0034, + EVR_LO, "UserContentLongLabel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0035, 0x3010, 0x0035, + EVR_SH, "EntityLabel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0036, 0x3010, 0x0036, + EVR_LO, "EntityName", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0037, 0x3010, 0x0037, + EVR_ST, "EntityDescription", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0038, 0x3010, 0x0038, + EVR_LO, "EntityLongLabel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0039, 0x3010, 0x0039, + EVR_US, "DeviceIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x003a, 0x3010, 0x003a, + EVR_US, "RTTreatmentPhaseIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x003b, 0x3010, 0x003b, + EVR_UI, "RTTreatmentPhaseUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x003c, 0x3010, 0x003c, + EVR_US, "RTPrescriptionIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x003d, 0x3010, 0x003d, + EVR_US, "RTSegmentAnnotationIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x003e, 0x3010, 0x003e, + EVR_US, "BasisRTTreatmentPhaseIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x003f, 0x3010, 0x003f, + EVR_US, "RelatedRTTreatmentPhaseIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0040, 0x3010, 0x0040, + EVR_US, "ReferencedRTTreatmentPhaseIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0041, 0x3010, 0x0041, + EVR_US, "ReferencedRTPrescriptionIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0042, 0x3010, 0x0042, + EVR_US, "ReferencedParentRTPrescriptionIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0043, 0x3010, 0x0043, + EVR_ST, "ManufacturerDeviceIdentifier", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0044, 0x3010, 0x0044, + EVR_SQ, "InstanceLevelReferencedPerformedProcedureStepSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0045, 0x3010, 0x0045, + EVR_CS, "RTTreatmentPhaseIntentPresenceFlag", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0046, 0x3010, 0x0046, + EVR_CS, "RadiotherapyTreatmentType", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0047, 0x3010, 0x0047, + EVR_CS, "TeletherapyRadiationType", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0048, 0x3010, 0x0048, + EVR_CS, "BrachytherapySourceType", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0049, 0x3010, 0x0049, + EVR_SQ, "ReferencedRTTreatmentPhaseSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x004a, 0x3010, 0x004a, + EVR_SQ, "ReferencedDirectSegmentInstanceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x004b, 0x3010, 0x004b, + EVR_SQ, "IntendedRTTreatmentPhaseSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x004c, 0x3010, 0x004c, + EVR_DA, "IntendedPhaseStartDate", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x004d, 0x3010, 0x004d, + EVR_DA, "IntendedPhaseEndDate", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x004e, 0x3010, 0x004e, + EVR_SQ, "RTTreatmentPhaseIntervalSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x004f, 0x3010, 0x004f, + EVR_CS, "TemporalRelationshipIntervalAnchor", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0050, 0x3010, 0x0050, + EVR_FD, "MinimumNumberOfIntervalDays", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0051, 0x3010, 0x0051, + EVR_FD, "MaximumNumberOfIntervalDays", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0052, 0x3010, 0x0052, + EVR_UI, "PertinentSOPClassesInStudy", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0053, 0x3010, 0x0053, + EVR_UI, "PertinentSOPClassesInSeries", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0054, 0x3010, 0x0054, + EVR_LO, "RTPrescriptionLabel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0055, 0x3010, 0x0055, + EVR_SQ, "RTPhysicianIntentPredecessorSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0056, 0x3010, 0x0056, + EVR_LO, "RTTreatmentApproachLabel", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0057, 0x3010, 0x0057, + EVR_SQ, "RTPhysicianIntentSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0058, 0x3010, 0x0058, + EVR_US, "RTPhysicianIntentIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0059, 0x3010, 0x0059, + EVR_CS, "RTTreatmentIntentType", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x005a, 0x3010, 0x005a, + EVR_UT, "RTPhysicianIntentNarrative", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x005b, 0x3010, 0x005b, + EVR_SQ, "RTProtocolCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x005c, 0x3010, 0x005c, + EVR_ST, "ReasonForSuperseding", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x005d, 0x3010, 0x005d, + EVR_SQ, "RTDiagnosisCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x005e, 0x3010, 0x005e, + EVR_US, "ReferencedRTPhysicianIntentIndex", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x005f, 0x3010, 0x005f, + EVR_SQ, "RTPhysicianIntentInputInstanceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0060, 0x3010, 0x0060, + EVR_SQ, "RTAnatomicPrescriptionSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0061, 0x3010, 0x0061, + EVR_UT, "PriorTreatmentDoseDescription", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0062, 0x3010, 0x0062, + EVR_SQ, "PriorTreatmentReferenceSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0063, 0x3010, 0x0063, + EVR_CS, "DosimetricObjectiveEvaluationScope", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0064, 0x3010, 0x0064, + EVR_SQ, "TherapeuticRoleCategoryCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0065, 0x3010, 0x0065, + EVR_SQ, "TherapeuticRoleTypeCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0066, 0x3010, 0x0066, + EVR_US, "ConceptualVolumeOptimizationPrecedence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0067, 0x3010, 0x0067, + EVR_SQ, "ConceptualVolumeCategoryCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0068, 0x3010, 0x0068, + EVR_CS, "ConceptualVolumeBlockingConstraint", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0069, 0x3010, 0x0069, + EVR_SQ, "ConceptualVolumeTypeCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x006a, 0x3010, 0x006a, + EVR_SQ, "ConceptualVolumeTypeModifierCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x006b, 0x3010, 0x006b, + EVR_SQ, "RTPrescriptionSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x006c, 0x3010, 0x006c, + EVR_SQ, "DosimetricObjectiveSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x006d, 0x3010, 0x006d, + EVR_SQ, "DosimetricObjectiveTypeCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x006e, 0x3010, 0x006e, + EVR_UI, "DosimetricObjectiveUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x006f, 0x3010, 0x006f, + EVR_UI, "ReferencedDosimetricObjectiveUID", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0070, 0x3010, 0x0070, + EVR_SQ, "DosimetricObjectiveParameterSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0071, 0x3010, 0x0071, + EVR_SQ, "ReferencedDosimetricObjectivesSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0073, 0x3010, 0x0073, + EVR_CS, "AbsoluteDosimetricObjectiveFlag", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0074, 0x3010, 0x0074, + EVR_FD, "DosimetricObjectiveWeight", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0075, 0x3010, 0x0075, + EVR_CS, "DosimetricObjectivePurpose", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0076, 0x3010, 0x0076, + EVR_SQ, "PlanningInputInformationSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0077, 0x3010, 0x0077, + EVR_LO, "TreatmentSite", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0078, 0x3010, 0x0078, + EVR_SQ, "TreatmentSiteCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0079, 0x3010, 0x0079, + EVR_SQ, "FractionPatternSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x007a, 0x3010, 0x007a, + EVR_UT, "TreatmentTechniqueNotes", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x007b, 0x3010, 0x007b, + EVR_UT, "PrescriptionNotes", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x007c, 0x3010, 0x007c, + EVR_IS, "NumberOfIntervalFractions", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x007d, 0x3010, 0x007d, + EVR_US, "NumberOfFractions", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x007e, 0x3010, 0x007e, + EVR_US, "IntendedDeliveryDuration", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x007f, 0x3010, 0x007f, + EVR_UT, "FractionationNotes", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0080, 0x3010, 0x0080, + EVR_SQ, "RTTreatmentTechniqueCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0081, 0x3010, 0x0081, + EVR_SQ, "PrescriptionNotesSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0082, 0x3010, 0x0082, + EVR_SQ, "FractionBasedRelationshipSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0083, 0x3010, 0x0083, + EVR_CS, "FractionBasedRelationshipIntervalAnchor", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0084, 0x3010, 0x0084, + EVR_FD, "MinimumHoursBetweenFractions", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0085, 0x3010, 0x0085, + EVR_TM, "IntendedFractionStartTime", 1, -1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0086, 0x3010, 0x0086, + EVR_LT, "IntendedStartDayOfWeek", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0087, 0x3010, 0x0087, + EVR_SQ, "WeekdayFractionPatternSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x3010, 0x0088, 0x3010, 0x0088, + EVR_SQ, "DeliveryTimeStructureCodeSequence", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } +#ifdef ENABLE_PRIVATE_TAGS + , { 0x3f01, 0x0001, 0x3f01, 0x0001, + EVR_LO, "InstitutionCode", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "INTELERAD MEDICAL SYSTEMS" } + , { 0x3f01, 0x0002, 0x3f01, 0x0002, + EVR_LO, "RoutedTransferAE", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "INTELERAD MEDICAL SYSTEMS" } + , { 0x3f01, 0x0003, 0x3f01, 0x0003, + EVR_LO, "SourceAE", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "INTELERAD MEDICAL SYSTEMS" } + , { 0x3f01, 0x0004, 0x3f01, 0x0004, + EVR_SH, "DeferredValidation", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "INTELERAD MEDICAL SYSTEMS" } + , { 0x3f01, 0x0005, 0x3f01, 0x0005, + EVR_LO, "SeriesOwner", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "INTELERAD MEDICAL SYSTEMS" } + , { 0x3f01, 0x0006, 0x3f01, 0x0006, + EVR_LO, "OrderGroupNumber", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "INTELERAD MEDICAL SYSTEMS" } + , { 0x3f01, 0x0007, 0x3f01, 0x0007, + EVR_SH, "StrippedPixelData", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "INTELERAD MEDICAL SYSTEMS" } + , { 0x3f01, 0x0008, 0x3f01, 0x0008, + EVR_SH, "PendingMoveRequest", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "INTELERAD MEDICAL SYSTEMS" } +#endif + , { 0x4000, 0x0010, 0x4000, 0x0010, + EVR_LT, "RETIRED_Arbitrary", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4000, 0x4000, 0x4000, 0x4000, + EVR_LT, "RETIRED_TextComments", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0040, 0x4008, 0x0040, + EVR_SH, "RETIRED_ResultsID", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0042, 0x4008, 0x0042, + EVR_LO, "RETIRED_ResultsIDIssuer", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0050, 0x4008, 0x0050, + EVR_SQ, "RETIRED_ReferencedInterpretationSequence", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x00ff, 0x4008, 0x00ff, + EVR_CS, "RETIRED_ReportProductionStatusTrial", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0100, 0x4008, 0x0100, + EVR_DA, "RETIRED_InterpretationRecordedDate", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0101, 0x4008, 0x0101, + EVR_TM, "RETIRED_InterpretationRecordedTime", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0102, 0x4008, 0x0102, + EVR_PN, "RETIRED_InterpretationRecorder", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0103, 0x4008, 0x0103, + EVR_LO, "RETIRED_ReferenceToRecordedSound", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0108, 0x4008, 0x0108, + EVR_DA, "RETIRED_InterpretationTranscriptionDate", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0109, 0x4008, 0x0109, + EVR_TM, "RETIRED_InterpretationTranscriptionTime", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x010a, 0x4008, 0x010a, + EVR_PN, "RETIRED_InterpretationTranscriber", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x010b, 0x4008, 0x010b, + EVR_ST, "RETIRED_InterpretationText", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x010c, 0x4008, 0x010c, + EVR_PN, "RETIRED_InterpretationAuthor", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0111, 0x4008, 0x0111, + EVR_SQ, "RETIRED_InterpretationApproverSequence", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0112, 0x4008, 0x0112, + EVR_DA, "RETIRED_InterpretationApprovalDate", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0113, 0x4008, 0x0113, + EVR_TM, "RETIRED_InterpretationApprovalTime", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0114, 0x4008, 0x0114, + EVR_PN, "RETIRED_PhysicianApprovingInterpretation", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0115, 0x4008, 0x0115, + EVR_LT, "RETIRED_InterpretationDiagnosisDescription", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0117, 0x4008, 0x0117, + EVR_SQ, "RETIRED_InterpretationDiagnosisCodeSequence", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0118, 0x4008, 0x0118, + EVR_SQ, "RETIRED_ResultsDistributionListSequence", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0119, 0x4008, 0x0119, + EVR_PN, "RETIRED_DistributionName", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x011a, 0x4008, 0x011a, + EVR_LO, "RETIRED_DistributionAddress", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0200, 0x4008, 0x0200, + EVR_SH, "RETIRED_InterpretationID", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0202, 0x4008, 0x0202, + EVR_LO, "RETIRED_InterpretationIDIssuer", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0210, 0x4008, 0x0210, + EVR_CS, "RETIRED_InterpretationTypeID", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0212, 0x4008, 0x0212, + EVR_CS, "RETIRED_InterpretationStatusID", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x0300, 0x4008, 0x0300, + EVR_ST, "RETIRED_Impressions", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4008, 0x4000, 0x4008, 0x4000, + EVR_ST, "RETIRED_ResultsComments", 1, 1, "DICOM/retired", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } +#ifdef ENABLE_PRIVATE_TAGS + , { 0x4009, 0x0001, 0x4009, 0x0001, + EVR_LT, "ReportID", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "SIEMENS ISI" } + , { 0x4009, 0x0020, 0x4009, 0x0020, + EVR_LT, "ReportStatus", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "SIEMENS ISI" } + , { 0x4009, 0x0030, 0x4009, 0x0030, + EVR_DA, "ReportCreationDate", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "SIEMENS ISI" } + , { 0x4009, 0x0070, 0x4009, 0x0070, + EVR_LT, "ReportApprovingPhysician", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "SIEMENS ISI" } + , { 0x4009, 0x00e0, 0x4009, 0x00e0, + EVR_LT, "ReportText", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "SIEMENS ISI" } + , { 0x4009, 0x00e1, 0x4009, 0x00e1, + EVR_LT, "ReportAuthor", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "SIEMENS ISI" } + , { 0x4009, 0x00e3, 0x4009, 0x00e3, + EVR_LT, "ReportingRadiologist", 1, 1, "PrivateTag", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + "SIEMENS ISI" } +#endif + , { 0x4010, 0x0001, 0x4010, 0x0001, + EVR_CS, "LowEnergyDetectors", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x0002, 0x4010, 0x0002, + EVR_CS, "HighEnergyDetectors", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x0004, 0x4010, 0x0004, + EVR_SQ, "DetectorGeometrySequence", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x1001, 0x4010, 0x1001, + EVR_SQ, "ThreatROIVoxelSequence", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x1004, 0x4010, 0x1004, + EVR_FL, "ThreatROIBase", 3, 3, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x1005, 0x4010, 0x1005, + EVR_FL, "ThreatROIExtents", 3, 3, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x1006, 0x4010, 0x1006, + EVR_OB, "ThreatROIBitmap", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x1007, 0x4010, 0x1007, + EVR_SH, "RouteSegmentID", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x1008, 0x4010, 0x1008, + EVR_CS, "GantryType", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x1009, 0x4010, 0x1009, + EVR_CS, "OOIOwnerType", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x100a, 0x4010, 0x100a, + EVR_SQ, "RouteSegmentSequence", 1, 1, "DICOM/DICOS", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x4010, 0x1010, 0x4010, 0x1010, + EVR_US, "PotentialThreatObjectID", 1, 1, "DICOM/DICOS", DcmDictRange_Unspecified, DcmDictRange_Unspecified, NULL } , { 0x4010, 0x1011, 0x4010, 0x1011, @@ -28404,6 +30062,14 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = { DcmDictRange_Unspecified, DcmDictRange_Unspecified, "SIEMENS MED" } #endif + , { 0x7fe0, 0x0001, 0x7fe0, 0x0001, + EVR_OV, "ExtendedOffsetTable", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } + , { 0x7fe0, 0x0002, 0x7fe0, 0x0002, + EVR_OV, "ExtendedOffsetTableLengths", 1, 1, "DICOM", + DcmDictRange_Unspecified, DcmDictRange_Unspecified, + NULL } , { 0x7fe0, 0x0008, 0x7fe0, 0x0008, EVR_OF, "FloatPixelData", 1, 1, "DICOM", DcmDictRange_Unspecified, DcmDictRange_Unspecified, diff --git a/dcmdata/libsrc/dcdirrec.cc b/dcmdata/libsrc/dcdirrec.cc index 4588a2b4..8bcda4f2 100644 --- a/dcmdata/libsrc/dcdirrec.cc +++ b/dcmdata/libsrc/dcdirrec.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -103,7 +103,8 @@ static const char *DRTypeNames[] = "PLAN", "SURFACE SCAN", "TRACT", - "ASSESSMENT" + "ASSESSMENT", + "RADIOTHERAPY" }; static const short DIM_OF_DRTypeNames = OFstatic_cast(short, (sizeof(DRTypeNames) / sizeof(DRTypeNames[0]))); @@ -436,6 +437,7 @@ OFCondition DcmDirectoryRecord::checkHierarchy(const E_DirRecType upperRecord, case ERT_SurfaceScan: case ERT_Tract: case ERT_Assessment: + case ERT_Radiotherapy: case ERT_Private: l_error = EC_Normal; break; @@ -532,6 +534,7 @@ OFCondition DcmDirectoryRecord::checkHierarchy(const E_DirRecType upperRecord, case ERT_SurfaceScan: case ERT_Tract: case ERT_Assessment: + case ERT_Radiotherapy: case ERT_Private: switch (lowerRecord) { @@ -1189,7 +1192,7 @@ OFCondition DcmDirectoryRecord::convertCharacterSet(DcmSpecificCharacterSet &con // ******************************** -void DcmDirectoryRecord::print(STD_NAMESPACE ostream&out, +void DcmDirectoryRecord::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char *pixelFileName, diff --git a/dcmdata/libsrc/dcelem.cc b/dcmdata/libsrc/dcelem.cc index 8c5d59fc..12dcf4c9 100644 --- a/dcmdata/libsrc/dcelem.cc +++ b/dcmdata/libsrc/dcelem.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -444,6 +444,22 @@ OFCondition DcmElement::getFloat32(Float32 & /*val*/, } +OFCondition DcmElement::getSint64(Sint64 & /*val*/, + const unsigned long /*pos*/) +{ + errorFlag = EC_IllegalCall; + return errorFlag; +} + + +OFCondition DcmElement::getUint64(Uint64 & /*val*/, + const unsigned long /*pos*/) +{ + errorFlag = EC_IllegalCall; + return errorFlag; +} + + OFCondition DcmElement::getFloat64(Float64 & /*val*/, const unsigned long /*pos*/) { @@ -556,6 +572,20 @@ OFCondition DcmElement::getFloat32Array(Float32 * & /*val*/) } +OFCondition DcmElement::getSint64Array(Sint64 * & /*val*/) +{ + errorFlag = EC_IllegalCall; + return errorFlag; +} + + +OFCondition DcmElement::getUint64Array(Uint64 * & /*val*/) +{ + errorFlag = EC_IllegalCall; + return errorFlag; +} + + OFCondition DcmElement::getFloat64Array(Float64 * & /*val*/) { errorFlag = EC_IllegalCall; diff --git a/dcmdata/libsrc/dcencdoc.cc b/dcmdata/libsrc/dcencdoc.cc index 398c2636..d83430dc 100644 --- a/dcmdata/libsrc/dcencdoc.cc +++ b/dcmdata/libsrc/dcencdoc.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2018, OFFIS e.V. + * Copyright (C) 2018-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -21,24 +21,26 @@ //make sure OS specific configuration is included first #include "dcmtk/config/osconfig.h" -#include "dcmtk/dcmdata/cmdlnarg.h" +#include "dcmtk/dcmdata/dcencdoc.h" + +#include "dcmtk/ofstd/ofconapp.h" +#include "dcmtk/ofstd/ofxml.h" +#include "dcmtk/ofstd/oftypes.h" + +#include "dcmtk/dcmdata/dcpath.h" #include "dcmtk/dcmdata/dccodec.h" -//for tag constants #include "dcmtk/dcmdata/dcdeftag.h" -#include "dcmtk/dcmdata/dcencdoc.h" -//for dcmtk version name #include "dcmtk/dcmdata/dcuid.h" -#include "dcmtk/dcmiod/modequipment.h" -#include "dcmtk/ofstd/ofdatime.h" -#include "dcmtk/ofstd/ofstd.h" -#include "dcmtk/ofstd/ofstdinc.h" +#include "dcmtk/dcmdata/dcvrpobw.h" +#include "dcmtk/dcmdata/dcvrui.h" +#include "dcmtk/dcmdata/dcvrda.h" +#include "dcmtk/dcmdata/dcvrtm.h" #define SHORTCOL 3 #define LONGCOL 21 // exit codes for this command line tool -// (common codes are defined in "ofexit.h" -// included from "ofconapp.h") +// (common codes are defined in "ofexit.h" included from "ofconapp.h") // general errors #define EXITCODE_MEMORY_EXHAUSTED 4 @@ -99,6 +101,7 @@ OFBool DcmEncapsulatedDocument::XMLsearchAttribute( OFString attr) { OFBool found = OFFalse; +#ifndef _XMLWIDECHAR if (currnode.nChildNode() == 0) { //"currnode has no children (leaf)"; @@ -125,6 +128,7 @@ OFBool DcmEncapsulatedDocument::XMLsearchAttribute( found |= childfound; } } +#endif return found; } @@ -132,8 +136,9 @@ OFString DcmEncapsulatedDocument::XMLgetAllAttributeValues( XMLNode fileNode, OFString attr) { - OFList attributeValueslist; OFString attributeValues; +#ifndef _XMLWIDECHAR + OFList attributeValueslist; if (XMLsearchAttribute(fileNode, &attributeValueslist, attr)) { //If the Attribute is mediaType, initialize with text/xml to exclude @@ -158,6 +163,7 @@ OFString DcmEncapsulatedDocument::XMLgetAllAttributeValues( attributeValues = ""; } } +#endif return attributeValues; } @@ -166,6 +172,7 @@ OFString DcmEncapsulatedDocument::XMLgetAttribute( DcmTagKey attr) { OFString result = ""; +#ifndef _XMLWIDECHAR if (attr == DCM_DocumentTitle) { if (fileNode.getChildNode("title").getText() != NULL) @@ -249,6 +256,7 @@ OFString DcmEncapsulatedDocument::XMLgetAttribute( { result = OFString(OFSTRING_GUARD(fileNode.getChildNode("code").getAttribute("displayName"))); } +#endif return result; } @@ -256,6 +264,10 @@ int DcmEncapsulatedDocument::getCDAData( const char *filename, OFLogger &appLogger) { +#ifdef _XMLWIDECHAR + OFLOG_ERROR(appLogger, "DCMTK compiled with \"wide char XML parser\". Cannot parse CDA data because of incompatible API."); + return 99; +#else if (ftype != "cda") { OFLOG_WARN(appLogger, "Filetype mismatch or filetype not set. Current ftype is " << ftype); @@ -461,6 +473,7 @@ int DcmEncapsulatedDocument::getCDAData( else opt_conceptCM = cCM; } return EXITCODE_NO_ERROR; +#endif } void DcmEncapsulatedDocument::addCDACommandlineOptions(OFCommandLine &cmd) @@ -762,8 +775,8 @@ OFCondition DcmEncapsulatedDocument::createIdentifiers(OFLogger& appLogger) cond = dfile.loadFile(opt_seriesFile, EXS_Unknown, EGL_noChange); if (cond.bad()) { - OFLOG_WARN(appLogger, cond.text() << - ": reading file: " << opt_seriesFile); + OFLOG_WARN(appLogger, cond.text() + << ": reading file: " << opt_seriesFile); } else { @@ -1167,7 +1180,7 @@ OFCondition DcmEncapsulatedDocument::createHeader( { OFLOG_DEBUG(logger, "Frame of Reference UID " << DCM_FrameOfReferenceUID - << "value was empty, generating a new one." + << " value was empty, generating a new one." ); dcmGenerateUniqueIdentifier(buf, SITE_SERIES_UID_ROOT); opt_frameOfReferenceUID = buf; @@ -1178,7 +1191,7 @@ OFCondition DcmEncapsulatedDocument::createHeader( { OFLOG_DEBUG(logger, "Frame of Reference UID " << DCM_FrameOfReferenceUID - << "value was faulty, generating a new one." + << " value was faulty, generating a new one." ); dcmGenerateUniqueIdentifier(buf, SITE_SERIES_UID_ROOT); opt_frameOfReferenceUID = buf; @@ -1195,53 +1208,61 @@ OFCondition DcmEncapsulatedDocument::createHeader( { if (opt_manufacturer.empty()) { - OFLOG_ERROR(logger, "No Manufacturer " + opt_manufacturer="DCMTK_MANUFACTURING"; + OFLOG_WARN(logger, "No Manufacturer " << DCM_Manufacturer - << " provided nor found in series " - <<"(required for Enhanced General Equipment module)." + << " provided nor found in series. This attribute is " + << "required for Enhanced General Equipment module. " + << opt_manufacturer + << " will be inserted as dummy value." ); - result = EC_InvalidValue; } - else result = dataset->putAndInsertOFStringArray(DCM_Manufacturer, opt_manufacturer); + result = dataset->putAndInsertOFStringArray(DCM_Manufacturer, opt_manufacturer); } if (result.good()) { if (opt_manufacturerModelName.empty()) { - OFLOG_ERROR(logger, "No Manufacturer Model Name " + opt_manufacturerModelName="DCMTK_3DMODEL_3"; + OFLOG_WARN(logger, "No Manufacturer Model Name " << DCM_ManufacturerModelName - << " provided nor found in series " - <<"(required for Enhanced General Equipment module)." + << " provided nor found in series. This attribute is " + << "required for Enhanced General Equipment module. " + << opt_manufacturerModelName + << " will be inserted as dummy value." ); - result = EC_InvalidValue; } - else result = dataset->putAndInsertOFStringArray(DCM_ManufacturerModelName, opt_manufacturerModelName); + result = dataset->putAndInsertOFStringArray(DCM_ManufacturerModelName, opt_manufacturerModelName); } if (result.good()) { if (opt_deviceSerialNumber.empty()) { - OFLOG_ERROR(logger, "No Device Serial Number " + opt_deviceSerialNumber="DCMTK01234567890"; + OFLOG_WARN(logger, "No Device Serial Number " << DCM_DeviceSerialNumber - << " provided nor found in series " - <<"(required for Enhanced General Equipment module)." + << " provided nor found in series. This attribute is " + << "required for Enhanced General Equipment module. " + << opt_deviceSerialNumber + << " will be inserted as dummy value." ); - result = EC_InvalidValue; } - else result = dataset->putAndInsertOFStringArray(DCM_DeviceSerialNumber, opt_deviceSerialNumber); + result = dataset->putAndInsertOFStringArray(DCM_DeviceSerialNumber, opt_deviceSerialNumber); } if (result.good()) { if (opt_softwareVersions.empty()) { - OFLOG_ERROR(logger, "No Software Versions " + opt_softwareVersions=OFFIS_DCMTK_VERSION; + OFLOG_WARN(logger, "No Software Versions " << DCM_SoftwareVersions - << " provided nor found in series " - <<"(required for Enhanced General Equipment module)." + << " provided nor found in series. This attribute is " + << "required for Enhanced General Equipment module. " + << opt_softwareVersions + << " will be inserted as dummy value." ); - result = EC_InvalidValue; } - else result = dataset->putAndInsertOFStringArray(DCM_SoftwareVersions, opt_softwareVersions); + result = dataset->putAndInsertOFStringArray(DCM_SoftwareVersions, opt_softwareVersions); } if (result.good()) { diff --git a/dcmdata/libsrc/dcerror.cc b/dcmdata/libsrc/dcerror.cc index 0fc70e34..be125dd7 100644 --- a/dcmdata/libsrc/dcerror.cc +++ b/dcmdata/libsrc/dcerror.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -76,6 +76,7 @@ makeOFConditionConst(EC_InvalidCharacter, OFM_dcmdata, 49, OF_err makeOFConditionConst(EC_UndefinedLengthOBOW, OFM_dcmdata, 51, OF_error, "Illegal element with OB or OW Value Representation and undefined length encountered"); makeOFConditionConst(EC_VOI_LUT_OBOW, OFM_dcmdata, 52, OF_error, "Illegal VOI LUT Sequence element with OB or OW Value Representation and explicit length encountered"); makeOFConditionConst(EC_PixelDataExplLengthIllegal, OFM_dcmdata, 53, OF_error, "Pixel data in top level dataset in compressed Transfer Syntax uses explicit length"); +makeOFConditionConst(EC_ElemLengthExceeds32BitField, OFM_dcmdata, 54, OF_error, "Length of element value exceeds maximum of 32-bit length field" ); const unsigned short EC_CODE_CannotSelectCharacterSet = 35; diff --git a/dcmdata/libsrc/dcfilefo.cc b/dcmdata/libsrc/dcfilefo.cc index c1f39d67..452ff97e 100644 --- a/dcmdata/libsrc/dcfilefo.cc +++ b/dcmdata/libsrc/dcfilefo.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -484,7 +484,6 @@ OFCondition DcmFileFormat::checkMetaHeaderValue(DcmMetaInfo *metainfo, const char *uid = OFFIS_IMPLEMENTATION_CLASS_UID; OFstatic_cast(DcmUniqueIdentifier *, elem)->putString(uid); } - } else if (xtag == DCM_ImplementationVersionName) // (0002,0013) { @@ -498,16 +497,17 @@ OFCondition DcmFileFormat::checkMetaHeaderValue(DcmMetaInfo *metainfo, const char *uid = OFFIS_DTK_IMPLEMENTATION_VERSION_NAME; OFstatic_cast(DcmShortString *, elem)->putString(uid); } - } - else if (xtag == DCM_SourceApplicationEntityTitle) // (0002,0016) + else if ((xtag == DCM_SourceApplicationEntityTitle) || // (0002,0016) + (xtag == DCM_SendingApplicationEntityTitle) || // (0002,0017) + (xtag == DCM_ReceivingApplicationEntityTitle)) // (0002,0018) { if (elem == NULL) { elem = new DcmApplicationEntity(tag); metainfo->insert(elem, OFTrue); } - DCMDATA_ERROR("DcmFileFormat: Don't know how to handle SourceApplicationEntityTitle"); + DCMDATA_WARN("DcmFileFormat: Don't know how to handle " << tag.getTagName()); } else if (xtag == DCM_PrivateInformationCreatorUID) // (0002,0100) { @@ -516,7 +516,7 @@ OFCondition DcmFileFormat::checkMetaHeaderValue(DcmMetaInfo *metainfo, elem = new DcmUniqueIdentifier(tag); metainfo->insert(elem, OFTrue); } - DCMDATA_ERROR("DcmFileFormat: Don't know how to handle PrivateInformationCreatorUID"); + DCMDATA_WARN("DcmFileFormat: Don't know how to handle PrivateInformationCreatorUID"); } else if (xtag == DCM_PrivateInformation) // (0002,0102) { @@ -526,9 +526,8 @@ OFCondition DcmFileFormat::checkMetaHeaderValue(DcmMetaInfo *metainfo, metainfo->insert(elem, OFTrue); } DCMDATA_WARN("DcmFileFormat: Don't know how to handle PrivateInformation"); - } else { - DCMDATA_WARN("DcmFileFormat: Don't know how to handle " << tag.getTagName()); - } + } else + DCMDATA_ERROR("DcmFileFormat: Don't know how to handle " << tag.getTagName()); /* if at this point elem still equals NULL, something is fishy */ if (elem == NULL) diff --git a/dcmdata/libsrc/dcitem.cc b/dcmdata/libsrc/dcitem.cc index 49b385c9..1a62caf9 100644 --- a/dcmdata/libsrc/dcitem.cc +++ b/dcmdata/libsrc/dcitem.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -55,11 +55,13 @@ #include "dcmtk/dcmdata/dcvrod.h" #include "dcmtk/dcmdata/dcvrof.h" #include "dcmtk/dcmdata/dcvrol.h" +#include "dcmtk/dcmdata/dcvrov.h" #include "dcmtk/dcmdata/dcvrpn.h" #include "dcmtk/dcmdata/dcvrsh.h" #include "dcmtk/dcmdata/dcvrsl.h" #include "dcmtk/dcmdata/dcvrss.h" #include "dcmtk/dcmdata/dcvrst.h" +#include "dcmtk/dcmdata/dcvrsv.h" #include "dcmtk/dcmdata/dcvrtm.h" #include "dcmtk/dcmdata/dcvruc.h" #include "dcmtk/dcmdata/dcvrui.h" @@ -68,6 +70,7 @@ #include "dcmtk/dcmdata/dcvrur.h" #include "dcmtk/dcmdata/dcvrus.h" #include "dcmtk/dcmdata/dcvrut.h" +#include "dcmtk/dcmdata/dcvruv.h" #include "dcmtk/dcmdata/dcxfer.h" #include "dcmtk/dcmdata/dcspchrs.h" /* for class DcmSpecificCharacterSet */ #include "dcmtk/dcmdata/dcjson.h" @@ -2464,7 +2467,7 @@ OFCondition DcmItem::findAndGetUint8Array(const DcmTagKey& tagKey, if (count != NULL) { if (status.good()) - *count = elem->getLength() / OFstatic_cast(unsigned long, sizeof(Uint8)); + *count = elem->getNumberOfValues(); else *count = 0; } @@ -2514,7 +2517,7 @@ OFCondition DcmItem::findAndGetUint16Array(const DcmTagKey& tagKey, if (count != NULL) { if (status.good()) - *count = elem->getLength() / OFstatic_cast(unsigned long, sizeof(Uint16)); + *count = elem->getNumberOfValues(); else *count = 0; } @@ -2564,7 +2567,7 @@ OFCondition DcmItem::findAndGetSint16Array(const DcmTagKey& tagKey, if (count != NULL) { if (status.good()) - *count = elem->getLength() / OFstatic_cast(unsigned long, sizeof(Sint16)); + *count = elem->getNumberOfValues(); else *count = 0; } @@ -2614,7 +2617,7 @@ OFCondition DcmItem::findAndGetUint32Array(const DcmTagKey& tagKey, if (count != NULL) { if (status.good()) - *count = elem->getLength() / OFstatic_cast(unsigned long, sizeof(Uint32)); + *count = elem->getNumberOfValues(); else *count = 0; } @@ -2664,7 +2667,107 @@ OFCondition DcmItem::findAndGetSint32Array(const DcmTagKey& tagKey, if (count != NULL) { if (status.good()) - *count = elem->getLength() / OFstatic_cast(unsigned long, sizeof(Sint32)); + *count = elem->getNumberOfValues(); + else + *count = 0; + } + /* reset value */ + if (status.bad()) + value = NULL; + return status; +} + + +OFCondition DcmItem::findAndGetUint64(const DcmTagKey& tagKey, + Uint64 &value, + const unsigned long pos, + const OFBool searchIntoSub) +{ + DcmElement *elem; + /* find the element */ + OFCondition status = findAndGetElement(tagKey, elem, searchIntoSub); + if (status.good()) + { + /* get the value */ + status = elem->getUint64(value, pos); + } + /* reset value */ + if (status.bad()) + value = 0; + return status; +} + + +OFCondition DcmItem::findAndGetUint64Array(const DcmTagKey& tagKey, + const Uint64 *&value, + unsigned long *count, + const OFBool searchIntoSub) +{ + DcmElement *elem; + /* find the element */ + OFCondition status = findAndGetElement(tagKey, elem, searchIntoSub); + if (status.good()) + { + /* get the value */ + Uint64 *array = NULL; + status = elem->getUint64Array(array); + value = array; + } + /* set optional count parameter */ + if (count != NULL) + { + if (status.good()) + *count = elem->getNumberOfValues(); + else + *count = 0; + } + /* reset value */ + if (status.bad()) + value = NULL; + return status; +} + + +OFCondition DcmItem::findAndGetSint64(const DcmTagKey& tagKey, + Sint64 &value, + const unsigned long pos, + const OFBool searchIntoSub) +{ + DcmElement *elem; + /* find the element */ + OFCondition status = findAndGetElement(tagKey, elem, searchIntoSub); + if (status.good()) + { + /* get the value */ + status = elem->getSint64(value, pos); + } + /* reset value */ + if (status.bad()) + value = 0; + return status; +} + + +OFCondition DcmItem::findAndGetSint64Array(const DcmTagKey& tagKey, + const Sint64 *&value, + unsigned long *count, + const OFBool searchIntoSub) +{ + DcmElement *elem; + /* find the element */ + OFCondition status = findAndGetElement(tagKey, elem, searchIntoSub); + if (status.good()) + { + /* get the value */ + Sint64 *array = NULL; + status = elem->getSint64Array(array); + value = array; + } + /* set optional count parameter */ + if (count != NULL) + { + if (status.good()) + *count = elem->getNumberOfValues(); else *count = 0; } @@ -2764,7 +2867,7 @@ OFCondition DcmItem::findAndGetFloat32Array(const DcmTagKey& tagKey, if (count != NULL) { if (status.good()) - *count = elem->getLength() / OFstatic_cast(unsigned long, sizeof(Float32)); + *count = elem->getNumberOfValues(); else *count = 0; } @@ -2814,7 +2917,7 @@ OFCondition DcmItem::findAndGetFloat64Array(const DcmTagKey& tagKey, if (count != NULL) { if (status.good()) - *count = elem->getLength() / OFstatic_cast(unsigned long, sizeof(Float64)); + *count = elem->getNumberOfValues(); else *count = 0; } @@ -3168,6 +3271,9 @@ OFCondition DcmItem::putAndInsertString(const DcmTag& tag, case EVR_OL: elem = new DcmOtherLong(tag); break; + case EVR_OV: + elem = new DcmOther64bitVeryLong(tag); + break; case EVR_PN: elem = new DcmPersonName(tag); break; @@ -3183,6 +3289,9 @@ OFCondition DcmItem::putAndInsertString(const DcmTag& tag, case EVR_ST: elem = new DcmShortText(tag); break; + case EVR_SV: + elem = new DcmSigned64bitVeryLong(tag); + break; case EVR_TM: elem = new DcmTime(tag); break; @@ -3204,6 +3313,9 @@ OFCondition DcmItem::putAndInsertString(const DcmTag& tag, case EVR_UT: elem = new DcmUnlimitedText(tag); break; + case EVR_UV: + elem = new DcmUnsigned64bitVeryLong(tag); + break; case EVR_UNKNOWN: /* Unknown VR, e.g. tag not found in data dictionary */ status = EC_UnknownVR; @@ -3913,6 +4025,9 @@ OFCondition DcmItem::insertEmptyElement(const DcmTag& tag, case EVR_OL: elem = new DcmOtherLong(tag); break; + case EVR_OV: + elem = new DcmOther64bitVeryLong(tag); + break; case EVR_PN: elem = new DcmPersonName(tag); break; @@ -3931,6 +4046,9 @@ OFCondition DcmItem::insertEmptyElement(const DcmTag& tag, case EVR_ST: elem = new DcmShortText(tag); break; + case EVR_SV: + elem = new DcmSigned64bitVeryLong(tag); + break; case EVR_TM: elem = new DcmTime(tag); break; @@ -3952,6 +4070,9 @@ OFCondition DcmItem::insertEmptyElement(const DcmTag& tag, case EVR_UT: elem = new DcmUnlimitedText(tag); break; + case EVR_UV: + elem = new DcmUnsigned64bitVeryLong(tag); + break; case EVR_PixelData: elem = new DcmPixelData(tag); // set VR to OW to make sure that we never write/send the internal VR @@ -4316,8 +4437,8 @@ OFCondition DcmItem::newDicomElement(DcmElement *&newElement, } /* update VR for tag, set "readAsUN" flag that makes sure the element value - * is read in Little Endian Implicit VR (i.e. the UN encoding) - */ + * is read in Little Endian Implicit VR (i.e. the UN encoding) + */ if (newTag.getEVR() != EVR_UNKNOWN) { tag.setVR(newTag.getVR()); @@ -4412,6 +4533,15 @@ OFCondition DcmItem::newDicomElement(DcmElement *&newElement, case EVR_OL : newElement = new DcmOtherLong(tag, length); break; + case EVR_SV : + newElement = new DcmSigned64bitVeryLong(tag, length); + break; + case EVR_UV : + newElement = new DcmUnsigned64bitVeryLong(tag, length); + break; + case EVR_OV : + newElement = new DcmOther64bitVeryLong(tag, length); + break; case EVR_FL : newElement = new DcmFloatingPointSingle(tag, length); break; diff --git a/dcmdata/libsrc/dcmetinf.cc b/dcmdata/libsrc/dcmetinf.cc index 8d6b7a5b..68b68784 100644 --- a/dcmdata/libsrc/dcmetinf.cc +++ b/dcmdata/libsrc/dcmetinf.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -138,7 +138,7 @@ void DcmMetaInfo::removeInvalidGroups() // ******************************** -void DcmMetaInfo::print(STD_NAMESPACE ostream&out, +void DcmMetaInfo::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char *pixelFileName, @@ -315,7 +315,7 @@ OFBool DcmMetaInfo::checkAndReadPreamble(DcmInputStream &inStream, DCMDATA_DEBUG("DcmMetaInfo::checkAndReadPreamble() TransferSyntax=\"" << DcmXfer(newxfer).getXferName() << "\""); } else - DCMDATA_TRACE("DcmMetaInfo::checkAndReadPreamble() No Preambel found"); + DCMDATA_TRACE("DcmMetaInfo::checkAndReadPreamble() No Preamble found"); return hasPreamble; } diff --git a/dcmdata/libsrc/dcobject.cc b/dcmdata/libsrc/dcobject.cc index d6917f36..8d1d2ad4 100644 --- a/dcmdata/libsrc/dcobject.cc +++ b/dcmdata/libsrc/dcobject.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -261,7 +261,7 @@ OFCondition DcmObject::writeJson(STD_NAMESPACE ostream& /*out*/, // *********************************************************** -void DcmObject::printNestingLevel(STD_NAMESPACE ostream&out, +void DcmObject::printNestingLevel(STD_NAMESPACE ostream &out, const size_t flags, const int level) { diff --git a/dcmdata/libsrc/dcpixel.cc b/dcmdata/libsrc/dcpixel.cc index 57b767a2..7c402499 100644 --- a/dcmdata/libsrc/dcpixel.cc +++ b/dcmdata/libsrc/dcpixel.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2018, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -694,7 +694,7 @@ DcmPixelData::insertRepresentationEntry( void DcmPixelData::print( - STD_NAMESPACE ostream&out, + STD_NAMESPACE ostream &out, const size_t flags, const int level, const char *pixelFileName, @@ -1090,7 +1090,7 @@ OFCondition DcmPixelData::write( } OFCondition DcmPixelData::writeXML( - STD_NAMESPACE ostream&out, + STD_NAMESPACE ostream &out, const size_t flags) { if (current == repListEnd) diff --git a/dcmdata/libsrc/dcpxitem.cc b/dcmdata/libsrc/dcpxitem.cc index 4e036f03..936ab274 100644 --- a/dcmdata/libsrc/dcpxitem.cc +++ b/dcmdata/libsrc/dcpxitem.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -242,7 +242,7 @@ OFCondition DcmPixelItem::createOffsetTable(const DcmOffsetList &offsetList) } -OFCondition DcmPixelItem::writeXML(STD_NAMESPACE ostream&out, +OFCondition DcmPixelItem::writeXML(STD_NAMESPACE ostream &out, const size_t flags) { if (flags & DCMTypes::XF_useNativeModel) diff --git a/dcmdata/libsrc/dcrleccd.cc b/dcmdata/libsrc/dcrleccd.cc index 11048b12..61fde6be 100644 --- a/dcmdata/libsrc/dcrleccd.cc +++ b/dcmdata/libsrc/dcrleccd.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2002-2018, OFFIS e.V. + * Copyright (C) 2002-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -96,7 +96,11 @@ OFCondition DcmRLECodecDecoder::decode( if (result.good()) { imageBytesAllocated = OFstatic_cast(Uint16, imageBitsAllocated / 8); - if ((imageBitsAllocated < 8)||(imageBitsAllocated % 8 != 0)) result = EC_CannotChangeRepresentation; + if ((imageBitsAllocated < 8)||(imageBitsAllocated % 8 != 0)) + { + DCMDATA_ERROR("The RLE decoder only supports images where BitsAllocated is a multiple of 8."); + result = EC_CannotChangeRepresentation; + } } if (result.good() && (imageSamplesPerPixel > 1)) { @@ -118,13 +122,14 @@ OFCondition DcmRLECodecDecoder::decode( { DcmPixelItem *pixItem = NULL; Uint8 * rleData = NULL; - const size_t bytesPerStripe = imageColumns * imageRows; + const size_t bytesPerStripe = OFstatic_cast(size_t, imageColumns) * OFstatic_cast(size_t, imageRows); DcmRLEDecoder rledecoder(bytesPerStripe); if (rledecoder.fail()) result = EC_MemoryExhausted; // RLE decoder failed to initialize else { - size_t frameSize = imageBytesAllocated * imageRows * imageColumns * imageSamplesPerPixel; + const size_t frameSize = OFstatic_cast(size_t, imageBytesAllocated) * OFstatic_cast(size_t, imageRows) + * OFstatic_cast(size_t, imageColumns) * OFstatic_cast(size_t, imageSamplesPerPixel); size_t totalSize = frameSize * imageFrames; if (totalSize & 1) totalSize++; // align on 16-bit word boundary Uint16 *imageData16 = NULL; @@ -132,7 +137,6 @@ OFCondition DcmRLECodecDecoder::decode( Uint32 currentItem = 1; // ignore offset table Uint32 numberOfStripes = 0; Uint32 fragmentLength = 0; - Uint32 i; result = uncompressedPixelData.createUint16Array(OFstatic_cast(Uint32, totalSize/sizeof(Uint16)), imageData16); if (result.good()) @@ -153,7 +157,11 @@ OFCondition DcmRLECodecDecoder::decode( { // we require that the RLE header must be completely // contained in the first fragment; otherwise bail out - if (fragmentLength < 64) result = EC_CannotChangeRepresentation; + if (fragmentLength < 64) + { + DCMDATA_ERROR("Pixel item shorter than 64 bytes, RLE header incomplete."); + result = EC_CannotChangeRepresentation; + } } } @@ -169,7 +177,10 @@ OFCondition DcmRLECodecDecoder::decode( // check that number of stripes in RLE header matches our expectation if ((numberOfStripes < 1) || (numberOfStripes > 15) || (numberOfStripes != OFstatic_cast(Uint32, imageBytesAllocated) * imageSamplesPerPixel)) + { + DCMDATA_ERROR("Number of stripes in RLE header incorrect: found " << numberOfStripes << ", expected " << (OFstatic_cast(Uint32, imageBytesAllocated) * imageSamplesPerPixel)); result = EC_CannotChangeRepresentation; + } } if (result.good()) @@ -201,14 +212,18 @@ OFCondition DcmRLECodecDecoder::decode( Uint32 pixel = 0; // for each stripe in stripe set - for (i=0; (igetLength(); result = pixItem->getUint8Array(rleData); + if (result.bad()) + { + DCMDATA_ERROR("Cannot access pixel fragment."); + } + } + else + { + DCMDATA_ERROR("Cannot access pixel fragment."); } } } @@ -231,7 +254,7 @@ OFCondition DcmRLECodecDecoder::decode( // byteOffset now points to the first byte of the new RLE stripe // check if the current stripe is the last one for this frame - if (i+1 == numberOfStripes) lastStripe = OFTrue; else lastStripe = OFFalse; + if (stripeIndex + 1 == numberOfStripes) lastStripe = OFTrue; else lastStripe = OFFalse; if (lastStripe) { @@ -275,11 +298,15 @@ OFCondition DcmRLECodecDecoder::decode( { // not the last stripe. We can use the offset table to determine // the number of bytes to feed to the RLE codec. - inputBytes = rleHeader[i+2]; - if (inputBytes < rleHeader[i+1]) result = EC_CannotChangeRepresentation; + inputBytes = rleHeader[stripeIndex+2]; + if (inputBytes < rleHeader[stripeIndex + 1]) + { + DCMDATA_ERROR("Byte offset in RLE header is wrong."); + result = EC_CannotChangeRepresentation; + } else { - inputBytes -= rleHeader[i+1]; // number of bytes to feed to codec + inputBytes -= rleHeader[stripeIndex + 1]; // number of bytes to feed to codec while ((inputBytes > (fragmentLength - byteOffset)) && result.good()) { // feed complete remaining content of fragment to RLE codec and @@ -315,7 +342,7 @@ OFCondition DcmRLECodecDecoder::decode( // copy the decoded stuff over to the buffer here... // make sure the RLE decoder has produced the right amount of data - lastStripeOfColor = lastStripe || ((imagePlanarConfiguration == 1) && ((i+1) % imageBytesAllocated == 0)); + lastStripeOfColor = lastStripe || ((imagePlanarConfiguration == 1) && ((stripeIndex + 1) % imageBytesAllocated == 0)); if (lastStripeOfColor && (rledecoder.size() < bytesPerStripe)) { @@ -333,8 +360,8 @@ OFCondition DcmRLECodecDecoder::decode( if (result.good()) { // which sample and byte are we currently compressing? - sample = i / imageBytesAllocated; - byte = i % imageBytesAllocated; + sample = stripeIndex / imageBytesAllocated; + byte = stripeIndex % imageBytesAllocated; // raw buffer containing bytesPerStripe bytes of uncompressed data outputBuffer = OFstatic_cast(Uint8 *, rledecoder.getOutputBuffer()); @@ -449,7 +476,11 @@ OFCondition DcmRLECodecDecoder::decodeFrame( if (result.good()) { imageBytesAllocated = OFstatic_cast(Uint16, imageBitsAllocated / 8); - if ((imageBitsAllocated < 8)||(imageBitsAllocated % 8 != 0)) return EC_CannotChangeRepresentation; + if ((imageBitsAllocated < 8)||(imageBitsAllocated % 8 != 0)) + { + DCMDATA_ERROR("The RLE decoder only supports images where BitsAllocated is a multiple of 8."); + return EC_CannotChangeRepresentation; + } } if (result.good() && (imageSamplesPerPixel > 1)) { @@ -465,11 +496,11 @@ OFCondition DcmRLECodecDecoder::decodeFrame( DcmPixelItem *pixItem = NULL; Uint8 * rleData = NULL; - const size_t bytesPerStripe = imageColumns * imageRows; + const size_t bytesPerStripe = OFstatic_cast(size_t, imageColumns) * OFstatic_cast(size_t, imageRows); Uint32 numberOfStripes = 0; Uint32 fragmentLength = 0; - Uint32 i; - Uint32 frameSize = imageBytesAllocated * imageRows * imageColumns * imageSamplesPerPixel; + Uint32 frameSize = OFstatic_cast(Uint32, imageBytesAllocated) * OFstatic_cast(Uint32, imageRows) + * OFstatic_cast(Uint32, imageColumns) * OFstatic_cast(Uint32, imageSamplesPerPixel); if (frameSize > bufSize) return EC_IllegalCall; @@ -510,7 +541,10 @@ OFCondition DcmRLECodecDecoder::decodeFrame( // check that number of stripes in RLE header matches our expectation if ((numberOfStripes < 1) || (numberOfStripes > 15) || (numberOfStripes != OFstatic_cast(Uint32, imageBytesAllocated) * imageSamplesPerPixel)) + { + DCMDATA_ERROR("Number of stripes in RLE header incorrect: found " << numberOfStripes << ", expected " << (OFstatic_cast(Uint32, imageBytesAllocated) * imageSamplesPerPixel)); return EC_CannotChangeRepresentation; + } // this variable keeps the current position within the current fragment Uint32 byteOffset = 0; @@ -538,17 +572,17 @@ OFCondition DcmRLECodecDecoder::decodeFrame( size_t bytesToDecode; // for each stripe in stripe set - for (i = 0; i < numberOfStripes; ++i) + for (Uint32 stripeIndex = 0; stripeIndex < numberOfStripes; ++stripeIndex) { // reset RLE codec rledecoder.clear(); // adjust start point for RLE stripe - byteOffset = rleHeader[i+1]; + byteOffset = rleHeader[stripeIndex + 1]; // byteOffset now points to the first byte of the new RLE stripe // check if the current stripe is the last one for this frame - if (i+1 == numberOfStripes) lastStripe = OFTrue; else lastStripe = OFFalse; + if (stripeIndex + 1 == numberOfStripes) lastStripe = OFTrue; else lastStripe = OFFalse; if (lastStripe) { @@ -563,10 +597,14 @@ OFCondition DcmRLECodecDecoder::decodeFrame( { // not the last stripe. We can use the offset table to determine // the number of bytes to feed to the RLE codec. - inputBytes = rleHeader[i+2]; - if (inputBytes < rleHeader[i+1]) return EC_CannotChangeRepresentation; + inputBytes = rleHeader[stripeIndex+2]; + if (inputBytes < rleHeader[stripeIndex + 1]) + { + DCMDATA_ERROR("Byte offset in RLE header is wrong."); + return EC_CannotChangeRepresentation; + } - inputBytes -= rleHeader[i+1]; // number of bytes to feed to codec + inputBytes -= rleHeader[stripeIndex + 1]; // number of bytes to feed to codec bytesToDecode = OFstatic_cast(size_t, inputBytes); } @@ -583,7 +621,7 @@ OFCondition DcmRLECodecDecoder::decodeFrame( // copy the decoded stuff over to the buffer here... // make sure the RLE decoder has produced the right amount of data - lastStripeOfColor = lastStripe || ((imagePlanarConfiguration == 1) && ((i+1) % imageBytesAllocated == 0)); + lastStripeOfColor = lastStripe || ((imagePlanarConfiguration == 1) && ((stripeIndex + 1) % imageBytesAllocated == 0)); if (lastStripeOfColor && (rledecoder.size() < bytesPerStripe)) { // stripe ended prematurely? report a warning and continue @@ -598,8 +636,8 @@ OFCondition DcmRLECodecDecoder::decodeFrame( // distribute decompressed bytes into output image array // which sample and byte are we currently decompressing? - sample = i / imageBytesAllocated; - byte = i % imageBytesAllocated; + sample = stripeIndex / imageBytesAllocated; + byte = stripeIndex % imageBytesAllocated; // raw buffer containing bytesPerStripe bytes of uncompressed data outputBuffer = OFstatic_cast(Uint8 *, rledecoder.getOutputBuffer()); diff --git a/dcmdata/libsrc/dcsequen.cc b/dcmdata/libsrc/dcsequen.cc index 942e7a7d..af8f7dbe 100644 --- a/dcmdata/libsrc/dcsequen.cc +++ b/dcmdata/libsrc/dcsequen.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -271,7 +271,7 @@ unsigned long DcmSequenceOfItems::card() const // ******************************** -void DcmSequenceOfItems::print(STD_NAMESPACE ostream&out, +void DcmSequenceOfItems::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char *pixelFileName, @@ -327,7 +327,7 @@ void DcmSequenceOfItems::print(STD_NAMESPACE ostream&out, // ******************************** -OFCondition DcmSequenceOfItems::writeXML(STD_NAMESPACE ostream&out, +OFCondition DcmSequenceOfItems::writeXML(STD_NAMESPACE ostream &out, const size_t flags) { OFCondition l_error = EC_Normal; diff --git a/dcmdata/libsrc/dcuid.cc b/dcmdata/libsrc/dcuid.cc index a9026d73..55469ac7 100644 --- a/dcmdata/libsrc/dcuid.cc +++ b/dcmdata/libsrc/dcuid.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -157,6 +157,7 @@ static const UIDNameMap uidNameMap[] = { { UID_BreastProjectionXRayImageStorageForProcessing, "BreastProjectionXRayImageStorageForProcessing" }, { UID_BreastTomosynthesisImageStorage, "BreastTomosynthesisImageStorage" }, { UID_CardiacElectrophysiologyWaveformStorage, "CardiacElectrophysiologyWaveformStorage" }, + { UID_CArmPhotonElectronRadiationStorage, "CArmPhotonElectronRadiationStorage" }, { UID_ChestCADSRStorage, "ChestCADSRStorage" }, { UID_ColonCADSRStorage, "ColonCADSRStorage" }, { UID_ColorPaletteStorage, "ColorPaletteStorage" }, @@ -229,6 +230,8 @@ static const UIDNameMap uidNameMap[] = { { UID_OphthalmicVisualFieldStaticPerimetryMeasurementsStorage, "OphthalmicVisualFieldStaticPerimetryMeasurementsStorage" }, { UID_ParametricMapStorage, "ParametricMapStorage" }, { UID_PatientRadiationDoseSRStorage, "PatientRadiationDoseSRStorage" }, + { UID_PerformedImagingAgentAdministrationSRStorage, "PerformedImagingAgentAdministrationSRStorage" }, + { UID_PlannedImagingAgentAdministrationSRStorage, "PlannedImagingAgentAdministrationSRStorage" }, { UID_PositronEmissionTomographyImageStorage, "PositronEmissionTomographyImageStorage" }, { UID_ProcedureLogStorage, "ProcedureLogStorage" }, { UID_ProtocolApprovalStorage, "ProtocolApprovalStorage" }, @@ -245,7 +248,10 @@ static const UIDNameMap uidNameMap[] = { { UID_RTImageStorage, "RTImageStorage" }, { UID_RTIonBeamsTreatmentRecordStorage, "RTIonBeamsTreatmentRecordStorage" }, { UID_RTIonPlanStorage, "RTIonPlanStorage" }, + { UID_RTPhysicianIntentStorage, "RTPhysicianIntentStorage" }, { UID_RTPlanStorage, "RTPlanStorage" }, + { UID_RTRadiationSetStorage, "RTRadiationSetStorage" }, + { UID_RTSegmentAnnotationStorage, "RTSegmentAnnotationStorage" }, { UID_RTStructureSetStorage, "RTStructureSetStorage" }, { UID_RTTreatmentSummaryRecordStorage, "RTTreatmentSummaryRecordStorage" }, { UID_SecondaryCaptureImageStorage, "SecondaryCaptureImageStorage" }, @@ -509,6 +515,7 @@ static const UIDNameMap uidNameMap[] = { // Well-known Frame of References { UID_ICBM452T1FrameOfReference, "ICBM452T1FrameOfReference" }, { UID_ICBMSingleSubjectMRIFrameOfReference, "ICBMSingleSubjectMRIFrameOfReference" }, + { UID_IEC61217FixedCoordinateSystemFrameOfReference, "IEC61217FixedCoordinateSystemFrameOfReference" }, { UID_SPM2AVG152PDFrameOfReference, "SPM2AVG152PDFrameOfReference" }, { UID_SPM2AVG152T1FrameOfReference, "SPM2AVG152T1FrameOfReference" }, { UID_SPM2AVG152T2FrameOfReference, "SPM2AVG152T2FrameOfReference" }, @@ -586,6 +593,7 @@ const char* dcmAllStorageSOPClassUIDs[] = { UID_BreastProjectionXRayImageStorageForProcessing, UID_BreastTomosynthesisImageStorage, UID_CardiacElectrophysiologyWaveformStorage, + UID_CArmPhotonElectronRadiationStorage, UID_ChestCADSRStorage, UID_ColonCADSRStorage, UID_ColorSoftcopyPresentationStateStorage, @@ -651,6 +659,8 @@ const char* dcmAllStorageSOPClassUIDs[] = { UID_OphthalmicVisualFieldStaticPerimetryMeasurementsStorage, UID_ParametricMapStorage, UID_PatientRadiationDoseSRStorage, + UID_PerformedImagingAgentAdministrationSRStorage, + UID_PlannedImagingAgentAdministrationSRStorage, UID_PositronEmissionTomographyImageStorage, UID_ProcedureLogStorage, UID_PseudoColorSoftcopyPresentationStateStorage, @@ -666,7 +676,10 @@ const char* dcmAllStorageSOPClassUIDs[] = { UID_RTImageStorage, UID_RTIonBeamsTreatmentRecordStorage, UID_RTIonPlanStorage, + UID_RTPhysicianIntentStorage, UID_RTPlanStorage, + UID_RTRadiationSetStorage, + UID_RTSegmentAnnotationStorage, UID_RTStructureSetStorage, UID_RTTreatmentSummaryRecordStorage, UID_SecondaryCaptureImageStorage, @@ -881,6 +894,7 @@ const char* dcmLongSCUStorageSOPClassUIDs[] = { // UID_AdvancedBlendingPresentationStateStorage, // UID_BreastProjectionXRayImageStorageForPresentation, // UID_BreastProjectionXRayImageStorageForProcessing, +// UID_CArmPhotonElectronRadiationStorage, // UID_CompositingPlanarMPRVolumetricPresentationStateStorage, // UID_ContentAssessmentResultsStorage, // UID_CornealTopographyMapStorage, @@ -893,8 +907,13 @@ const char* dcmLongSCUStorageSOPClassUIDs[] = { // UID_OphthalmicOpticalCoherenceTomographyEnFaceImageStorage, // UID_ParametricMapStorage, // UID_PatientRadiationDoseSRStorage, +// UID_PerformedImagingAgentAdministrationSRStorage, +// UID_PlannedImagingAgentAdministrationSRStorage, // UID_RadiopharmaceuticalRadiationDoseSRStorage, // UID_RTBrachyApplicationSetupDeliveryInstructionStorage, +// UID_RTPhysicianIntentStorage, +// UID_RTRadiationSetStorage, +// UID_RTSegmentAnnotationStorage, // UID_SegmentedVolumeRenderingVolumetricPresentationStateStorage, // UID_SimplifiedAdultEchoSRStorage, // UID_TractographyResultsStorage, @@ -1154,6 +1173,7 @@ static const DcmModalityTable modalities[] = { { UID_BreastProjectionXRayImageStorageForProcessing, "BP", 4096 * 4096 * 2 }, { UID_BreastTomosynthesisImageStorage, "BT", 4096 * 4096 * 2 }, { UID_CardiacElectrophysiologyWaveformStorage, "WVc", 4096 }, + { UID_CArmPhotonElectronRadiationStorage, "RRc", 4096 }, { UID_ChestCADSRStorage, "SRh", 4096 }, { UID_ColonCADSRStorage, "SRo", 4096 }, { UID_ColorPaletteStorage, "CP", 4096 }, @@ -1225,6 +1245,8 @@ static const DcmModalityTable modalities[] = { { UID_OphthalmicVisualFieldStaticPerimetryMeasurementsStorage, "OPp", 4096 }, { UID_ParametricMapStorage, "PM", 256 * 256 * 4 }, { UID_PatientRadiationDoseSRStorage, "SRq", 4096 }, + { UID_PerformedImagingAgentAdministrationSRStorage, "SRi", 4096 }, + { UID_PlannedImagingAgentAdministrationSRStorage, "SRj", 4096 }, { UID_PositronEmissionTomographyImageStorage, "PI", 512 * 512 * 2 }, { UID_ProcedureLogStorage, "SRp", 4096 }, { UID_ProtocolApprovalStorage, "PA", 4096 }, @@ -1242,6 +1264,9 @@ static const DcmModalityTable modalities[] = { { UID_RTIonBeamsTreatmentRecordStorage, "RTi", 4096 }, { UID_RTIonPlanStorage, "RPi", 4096 }, { UID_RTPlanStorage, "RP" , 4096 }, + { UID_RTPhysicianIntentStorage, "RIp", 4096 }, + { UID_RTRadiationSetStorage, "RRs", 4096 }, + { UID_RTSegmentAnnotationStorage, "RSa", 4096 }, { UID_RTStructureSetStorage, "RS", 4096 }, { UID_RTTreatmentSummaryRecordStorage, "RTs", 4096 }, { UID_SecondaryCaptureImageStorage, "SC", 512 * 512 * 2 }, diff --git a/dcmdata/libsrc/dcvr.cc b/dcmdata/libsrc/dcvr.cc index 910135ea..f27c9343 100644 --- a/dcmdata/libsrc/dcvr.cc +++ b/dcmdata/libsrc/dcvr.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -39,6 +39,9 @@ OFGlobal dcmEnableOtherDoubleVRGeneration(OFTrue); OFGlobal dcmEnableOtherLongVRGeneration(OFTrue); OFGlobal dcmEnableUniversalResourceIdentifierOrLocatorVRGeneration(OFTrue); OFGlobal dcmEnableUnlimitedCharactersVRGeneration(OFTrue); +OFGlobal dcmEnableOther64bitVeryLongVRGeneration(OFTrue); +OFGlobal dcmEnableSigned64bitVeryLongVRGeneration(OFTrue); +OFGlobal dcmEnableUnsigned64bitVeryLongVRGeneration(OFTrue); OFGlobal dcmEnableUnknownVRConversion(OFFalse); /* @@ -53,6 +56,9 @@ void dcmEnableGenerationOfNewVRs() dcmEnableOtherLongVRGeneration.set(OFTrue); dcmEnableUniversalResourceIdentifierOrLocatorVRGeneration.set(OFTrue); dcmEnableUnlimitedCharactersVRGeneration.set(OFTrue); + dcmEnableOther64bitVeryLongVRGeneration.set(OFTrue); + dcmEnableSigned64bitVeryLongVRGeneration.set(OFTrue); + dcmEnableUnsigned64bitVeryLongVRGeneration.set(OFTrue); } void dcmDisableGenerationOfNewVRs() @@ -64,6 +70,9 @@ void dcmDisableGenerationOfNewVRs() dcmEnableOtherLongVRGeneration.set(OFFalse); dcmEnableUniversalResourceIdentifierOrLocatorVRGeneration.set(OFFalse); dcmEnableUnlimitedCharactersVRGeneration.set(OFFalse); + dcmEnableOther64bitVeryLongVRGeneration.set(OFFalse); + dcmEnableSigned64bitVeryLongVRGeneration.set(OFFalse); + dcmEnableUnsigned64bitVeryLongVRGeneration.set(OFFalse); } @@ -78,6 +87,7 @@ void dcmDisableGenerationOfNewVRs() #define DCMVR_PROP_ISASTRING 0x08 #define DCMVR_PROP_ISAFFECTEDBYCHARSET 0x10 #define DCMVR_PROP_ISLENGTHINCHAR 0x20 +#define DCMVR_PROP_UNDEFINEDLENGTH 0x40 struct DcmVREntry { DcmEVR vr; // Enumeration Value of Value representation @@ -101,23 +111,25 @@ static const DcmVREntry DcmVRDict[] = { { EVR_CS, "CS", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING, 0, 16 }, { EVR_DA, "DA", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING, 8, 10 }, { EVR_DS, "DS", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING, 0, 16 }, - { EVR_DT, "DT", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING, 0, 26}, + { EVR_DT, "DT", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING, 0, 26 }, { EVR_FL, "FL", &noDelimiters, sizeof(Float32), DCMVR_PROP_NONE, 4, 4 }, { EVR_FD, "FD", &noDelimiters, sizeof(Float64), DCMVR_PROP_NONE, 8, 8 }, { EVR_IS, "IS", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING, 0, 12 }, { EVR_LO, "LO", &bsDelimiter, sizeof(char), DCMVR_PROP_ISASTRING | DCMVR_PROP_ISAFFECTEDBYCHARSET | DCMVR_PROP_ISLENGTHINCHAR, 0, 64 }, { EVR_LT, "LT", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING | DCMVR_PROP_ISAFFECTEDBYCHARSET | DCMVR_PROP_ISLENGTHINCHAR, 0, 10240 }, - { EVR_OB, "OB", &noDelimiters, sizeof(Uint8), DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, DCM_UndefinedLength }, - { EVR_OD, "OD", &noDelimiters, sizeof(Float64), DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, 4294967288U }, - { EVR_OF, "OF", &noDelimiters, sizeof(Float32), DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, 4294967292U }, - { EVR_OL, "OL", &noDelimiters, sizeof(Uint32), DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, DCM_UndefinedLength }, - { EVR_OW, "OW", &noDelimiters, sizeof(Uint16), DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, DCM_UndefinedLength }, + { EVR_OB, "OB", &noDelimiters, sizeof(Uint8), DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, 4294967294U }, + { EVR_OD, "OD", &noDelimiters, sizeof(Float64), DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, 4294967288U }, + { EVR_OF, "OF", &noDelimiters, sizeof(Float32), DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, 4294967292U }, + { EVR_OL, "OL", &noDelimiters, sizeof(Uint32), DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, 4294967292U }, + { EVR_OV, "OV", &noDelimiters, sizeof(Uint64), DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, 4294967288U }, + { EVR_OW, "OW", &noDelimiters, sizeof(Uint16), DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, 4294967294U }, { EVR_PN, "PN", &pnDelimiters, sizeof(char), DCMVR_PROP_ISASTRING | DCMVR_PROP_ISAFFECTEDBYCHARSET | DCMVR_PROP_ISLENGTHINCHAR, 0, 64 }, { EVR_SH, "SH", &bsDelimiter, sizeof(char), DCMVR_PROP_ISASTRING | DCMVR_PROP_ISAFFECTEDBYCHARSET | DCMVR_PROP_ISLENGTHINCHAR, 0, 16 }, { EVR_SL, "SL", &noDelimiters, sizeof(Sint32), DCMVR_PROP_NONE, 4, 4 }, - { EVR_SQ, "SQ", &noDelimiters, 0, DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, DCM_UndefinedLength }, + { EVR_SQ, "SQ", &noDelimiters, 0, DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, 4294967294U }, { EVR_SS, "SS", &noDelimiters, sizeof(Sint16), DCMVR_PROP_NONE, 2, 2 }, { EVR_ST, "ST", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING | DCMVR_PROP_ISAFFECTEDBYCHARSET | DCMVR_PROP_ISLENGTHINCHAR, 0, 1024 }, + { EVR_SV, "SV", &noDelimiters, sizeof(Sint64), DCMVR_PROP_EXTENDEDLENGTHENCODING, 8, 8 }, { EVR_TM, "TM", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING, 0, 16 }, { EVR_UC, "UC", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING | DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_ISAFFECTEDBYCHARSET, 0, 4294967294U }, { EVR_UI, "UI", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING, 0, 64 }, @@ -125,9 +137,10 @@ static const DcmVREntry DcmVRDict[] = { { EVR_UR, "UR", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING|DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, 4294967294U }, { EVR_US, "US", &noDelimiters, sizeof(Uint16), DCMVR_PROP_NONE, 2, 2 }, { EVR_UT, "UT", &noDelimiters, sizeof(char), DCMVR_PROP_ISASTRING | DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_ISAFFECTEDBYCHARSET, 0, 4294967294U }, - { EVR_ox, "ox", &noDelimiters, sizeof(Uint8), DCMVR_PROP_NONSTANDARD | DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, DCM_UndefinedLength }, + { EVR_UV, "UV", &noDelimiters, sizeof(Uint64), DCMVR_PROP_EXTENDEDLENGTHENCODING, 8, 8 }, + { EVR_ox, "ox", &noDelimiters, sizeof(Uint8), DCMVR_PROP_NONSTANDARD | DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, 4294967294U }, { EVR_xs, "xs", &noDelimiters, sizeof(Uint16), DCMVR_PROP_NONSTANDARD, 2, 2 }, - { EVR_lt, "lt", &noDelimiters, sizeof(Uint16), DCMVR_PROP_NONSTANDARD | DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, DCM_UndefinedLength }, + { EVR_lt, "lt", &noDelimiters, sizeof(Uint16), DCMVR_PROP_NONSTANDARD | DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, 4294967294U }, { EVR_na, "na", &noDelimiters, 0, DCMVR_PROP_NONSTANDARD, 0, 0 }, { EVR_up, "up", &noDelimiters, sizeof(Uint32), DCMVR_PROP_NONSTANDARD, 4, 4 }, @@ -152,10 +165,10 @@ static const DcmVREntry DcmVRDict[] = { DCMVR_PROP_NONSTANDARD, 0, DCM_UndefinedLength }, { EVR_UNKNOWN, "??", &noDelimiters, sizeof(Uint8), /* EVR_UNKNOWN (i.e. "future" VRs) should be mapped to UN or OB */ - DCMVR_PROP_NONSTANDARD | DCMVR_PROP_INTERNAL | DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, DCM_UndefinedLength }, + DCMVR_PROP_NONSTANDARD | DCMVR_PROP_INTERNAL | DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, DCM_UndefinedLength }, /* Unknown Value Representation */ - { EVR_UN, "UN", &noDelimiters, sizeof(Uint8), DCMVR_PROP_EXTENDEDLENGTHENCODING, 0, DCM_UndefinedLength }, + { EVR_UN, "UN", &noDelimiters, sizeof(Uint8), DCMVR_PROP_EXTENDEDLENGTHENCODING | DCMVR_PROP_UNDEFINEDLENGTH, 0, 4294967294U }, /* Pixel Data - only used in ident() */ { EVR_PixelData, "PixelData", &noDelimiters, 0, DCMVR_PROP_INTERNAL, 0, DCM_UndefinedLength }, @@ -345,6 +358,33 @@ DcmVR::getValidEVR() const evr = EVR_OB; /* handle UC as if OB */ } break; + case EVR_OV: + if (!dcmEnableOther64bitVeryLongVRGeneration.get()) + { + if (dcmEnableUnknownVRGeneration.get()) + evr = EVR_UN; /* handle OV as if UN */ + else + evr = EVR_OB; /* handle OV as if OB */ + } + break; + case EVR_SV: + if (!dcmEnableSigned64bitVeryLongVRGeneration.get()) + { + if (dcmEnableUnknownVRGeneration.get()) + evr = EVR_UN; /* handle SV as if UN */ + else + evr = EVR_OB; /* handle SV as if OB */ + } + break; + case EVR_UV: + if (!dcmEnableUnsigned64bitVeryLongVRGeneration.get()) + { + if (dcmEnableUnknownVRGeneration.get()) + evr = EVR_UN; /* handle UV as if UN */ + else + evr = EVR_OB; /* handle UV as if OB */ + } + break; default: /* in all other cases, do nothing */ break; @@ -407,6 +447,13 @@ DcmVR::usesExtendedLengthEncoding() const return (DcmVRDict[vr].propertyFlags & DCMVR_PROP_EXTENDEDLENGTHENCODING) ? OFTrue : OFFalse; } +/* returns true if VR supports undefined length */ +OFBool +DcmVR::supportsUndefinedLength() const +{ + return (DcmVRDict[vr].propertyFlags & DCMVR_PROP_UNDEFINEDLENGTH) ? OFTrue : OFFalse; +} + Uint32 DcmVR::getMinValueLength() const { diff --git a/dcmdata/libsrc/dcvrda.cc b/dcmdata/libsrc/dcvrda.cc index e64443a2..d459de0c 100644 --- a/dcmdata/libsrc/dcvrda.cc +++ b/dcmdata/libsrc/dcvrda.cc @@ -23,6 +23,7 @@ #include "dcmtk/dcmdata/dcvrda.h" #include "dcmtk/dcmdata/dcvrtm.h" +#include "dcmtk/ofstd/ofstd.h" #define INCLUDE_CSTDIO #include "dcmtk/ofstd/ofstdinc.h" diff --git a/dcmdata/libsrc/dcvrfd.cc b/dcmdata/libsrc/dcvrfd.cc index 27f2a737..acf6758c 100644 --- a/dcmdata/libsrc/dcvrfd.cc +++ b/dcmdata/libsrc/dcvrfd.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -158,7 +158,7 @@ unsigned long DcmFloatingPointDouble::getNumberOfValues() // ******************************** -void DcmFloatingPointDouble::print(STD_NAMESPACE ostream&out, +void DcmFloatingPointDouble::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char * /*pixelFileName*/, diff --git a/dcmdata/libsrc/dcvrfl.cc b/dcmdata/libsrc/dcvrfl.cc index 473af412..c8673e69 100644 --- a/dcmdata/libsrc/dcvrfl.cc +++ b/dcmdata/libsrc/dcvrfl.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -160,7 +160,7 @@ unsigned long DcmFloatingPointSingle::getNumberOfValues() // ******************************** -void DcmFloatingPointSingle::print(STD_NAMESPACE ostream&out, +void DcmFloatingPointSingle::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char * /*pixelFileName*/, diff --git a/dcmdata/libsrc/dcvrobow.cc b/dcmdata/libsrc/dcvrobow.cc index c65764a8..6ad14ae4 100644 --- a/dcmdata/libsrc/dcvrobow.cc +++ b/dcmdata/libsrc/dcvrobow.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -25,6 +25,7 @@ #include "dcmtk/ofstd/ofstd.h" #include "dcmtk/ofstd/ofstream.h" #include "dcmtk/ofstd/ofuuid.h" +#include "dcmtk/ofstd/offile.h" #include "dcmtk/dcmdata/dcjson.h" #include "dcmtk/dcmdata/dcvrobow.h" @@ -165,7 +166,7 @@ OFCondition DcmOtherByteOtherWord::setVR(DcmEVR vr) // ******************************** -void DcmOtherByteOtherWord::print(STD_NAMESPACE ostream&out, +void DcmOtherByteOtherWord::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char * /*pixelFileName*/, @@ -273,18 +274,20 @@ void DcmOtherByteOtherWord::printPixel(STD_NAMESPACE ostream &out, { swapIfNecessary(EBO_LittleEndian, gLocalByteOrder, data, getLengthField(), sizeof(Uint16)); setByteOrder(EBO_LittleEndian); - const size_t count = OFstatic_cast(size_t, getLengthField() / sizeof(Uint16)); - if (fwrite(data, sizeof(Uint16), count, file) != count) - DCMDATA_WARN("DcmOtherByteOtherWord: Can't write pixel data to output file: " << fname); + const size_t tobewritten = OFstatic_cast(size_t, getLengthField() / sizeof(Uint16)); + const size_t written = fwrite(data, sizeof(Uint16), tobewritten, file); + if (written != tobewritten) + DCMDATA_WARN("DcmOtherByteOtherWord: Some bytes were not written: " << (tobewritten - written)); } } else { Uint8 *data = NULL; getUint8Array(data); if (data != NULL) { - const size_t count = OFstatic_cast(size_t, getLengthField()); - if (fwrite(data, sizeof(Uint8), count, file) != count) - DCMDATA_WARN("DcmOtherByteOtherWord: Can't write pixel data to output file: " << fname); + const size_t tobewritten = OFstatic_cast(size_t, getLengthField()); + const size_t written = fwrite(data, sizeof(Uint8), tobewritten, file); + if (written != tobewritten) + DCMDATA_WARN("DcmOtherByteOtherWord: Some bytes were not written: " << (tobewritten - written)); } } fclose(file); @@ -397,7 +400,14 @@ OFCondition DcmOtherByteOtherWord::createUint16Array(const Uint32 numWords, { /* check value representation */ if ((getTag().getEVR() == EVR_OW) || (getTag().getEVR() == EVR_lt)) - errorFlag = createEmptyValue(OFstatic_cast(Uint32, sizeof(Uint16) * OFstatic_cast(size_t, numWords))); + { + Uint32 bytesRequired = 0; + OFBool size_fits = OFStandard::safeMult(numWords, OFstatic_cast(Uint32, sizeof(Uint16)), bytesRequired); + if (size_fits) + errorFlag = createEmptyValue(bytesRequired); + else + errorFlag = EC_CorruptedData; + } else errorFlag = EC_CorruptedData; if (errorFlag.good()) diff --git a/dcmdata/libsrc/dcvrod.cc b/dcmdata/libsrc/dcvrod.cc index 6fe47b4f..1d63ccd8 100644 --- a/dcmdata/libsrc/dcvrod.cc +++ b/dcmdata/libsrc/dcvrod.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2013-2016, OFFIS e.V. + * Copyright (C) 2013-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -23,6 +23,7 @@ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ #include "dcmtk/ofstd/ofuuid.h" +#include "dcmtk/ofstd/ofstd.h" #include "dcmtk/dcmdata/dcvrod.h" #include "dcmtk/dcmdata/dcswap.h" @@ -189,3 +190,23 @@ OFCondition DcmOtherDouble::writeJson(STD_NAMESPACE ostream &out, /* always report success */ return EC_Normal; } + + +// ******************************** + + +OFCondition DcmOtherDouble::createFloat64Array(const Uint32 numDoubles, + Float64 *&doubleVals) +{ + Uint32 bytesRequired = 0; + /* make sure that max length is not exceeded */ + if (OFStandard::safeMult(numDoubles, OFstatic_cast(Uint32, sizeof(Float64)), bytesRequired)) + errorFlag = createEmptyValue(bytesRequired); + else + errorFlag = EC_ElemLengthExceeds32BitField; + if (errorFlag.good()) + doubleVals = OFstatic_cast(Float64 *, this->getValue()); + else + doubleVals = NULL; + return errorFlag; +} diff --git a/dcmdata/libsrc/dcvrof.cc b/dcmdata/libsrc/dcvrof.cc index b29ddb2a..8c4e2355 100644 --- a/dcmdata/libsrc/dcvrof.cc +++ b/dcmdata/libsrc/dcvrof.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2002-2017, OFFIS e.V. + * Copyright (C) 2002-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -23,6 +23,7 @@ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ #include "dcmtk/ofstd/ofuuid.h" +#include "dcmtk/ofstd/ofstd.h" #include "dcmtk/dcmdata/dcjson.h" #include "dcmtk/dcmdata/dcvrof.h" @@ -189,3 +190,23 @@ OFCondition DcmOtherFloat::writeJson(STD_NAMESPACE ostream &out, /* always report success */ return EC_Normal; } + + +// ******************************** + + +OFCondition DcmOtherFloat::createFloat32Array(const Uint32 numFloats, + Float32 *&floatVals) +{ + Uint32 bytesRequired = 0; + /* make sure that max length is not exceeded */ + if (OFStandard::safeMult(numFloats, OFstatic_cast(Uint32, sizeof(Float32)), bytesRequired)) + errorFlag = createEmptyValue(bytesRequired); + else + errorFlag = EC_ElemLengthExceeds32BitField; + if (errorFlag.good()) + floatVals = OFstatic_cast(Float32 *, this->getValue()); + else + floatVals = NULL; + return errorFlag; +} diff --git a/dcmdata/libsrc/dcvrol.cc b/dcmdata/libsrc/dcvrol.cc index 8d3b43ae..cbb1b6c6 100644 --- a/dcmdata/libsrc/dcvrol.cc +++ b/dcmdata/libsrc/dcvrol.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2016-2017, OFFIS e.V. + * Copyright (C) 2016-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -23,6 +23,7 @@ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ #include "dcmtk/ofstd/ofuuid.h" +#include "dcmtk/ofstd/ofstd.h" #include "dcmtk/dcmdata/dcvrol.h" #include "dcmtk/dcmdata/dcjson.h" @@ -191,3 +192,23 @@ OFCondition DcmOtherLong::writeJson(STD_NAMESPACE ostream &out, /* always report success */ return EC_Normal; } + + +// ******************************** + + +OFCondition DcmOtherLong::createUint32Array(const Uint32 numDoubleWords, + Uint32 *&doubleWords) +{ + Uint32 bytesRequired = 0; + /* make sure that max length is not exceeded */ + if (OFStandard::safeMult(numDoubleWords, OFstatic_cast(Uint32, sizeof(Uint32)), bytesRequired)) + errorFlag = createEmptyValue(bytesRequired); + else + errorFlag = EC_ElemLengthExceeds32BitField; + if (errorFlag.good()) + doubleWords = OFstatic_cast(Uint32 *, this->getValue()); + else + doubleWords = NULL; + return errorFlag; +} diff --git a/dcmdata/libsrc/dcvrov.cc b/dcmdata/libsrc/dcvrov.cc new file mode 100644 index 00000000..c671732d --- /dev/null +++ b/dcmdata/libsrc/dcvrov.cc @@ -0,0 +1,214 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: Implementation of class DcmOther64bitVeryLong + * + */ + + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/ofstd/ofuuid.h" +#include "dcmtk/ofstd/ofstd.h" + +#include "dcmtk/dcmdata/dcvrov.h" +#include "dcmtk/dcmdata/dcjson.h" +#include "dcmtk/dcmdata/dcswap.h" + + +// ******************************** + + +DcmOther64bitVeryLong::DcmOther64bitVeryLong(const DcmTag &tag) + : DcmUnsigned64bitVeryLong(tag, 0) +{ +} + + +DcmOther64bitVeryLong::DcmOther64bitVeryLong(const DcmTag &tag, + const Uint32 len) + : DcmUnsigned64bitVeryLong(tag, len) +{ +} + + +DcmOther64bitVeryLong::DcmOther64bitVeryLong(const DcmOther64bitVeryLong &old) + : DcmUnsigned64bitVeryLong(old) +{ +} + + +DcmOther64bitVeryLong::~DcmOther64bitVeryLong() +{ +} + + +DcmOther64bitVeryLong &DcmOther64bitVeryLong::operator=(const DcmOther64bitVeryLong &obj) +{ + DcmUnsigned64bitVeryLong::operator=(obj); + return *this; +} + + +OFCondition DcmOther64bitVeryLong::copyFrom(const DcmObject& rhs) +{ + if (this != &rhs) + { + if (rhs.ident() != ident()) return EC_IllegalCall; + *this = OFstatic_cast(const DcmOther64bitVeryLong &, rhs); + } + return EC_Normal; +} + + +// ******************************** + + +DcmEVR DcmOther64bitVeryLong::ident() const +{ + return EVR_OV; +} + + +OFCondition DcmOther64bitVeryLong::checkValue(const OFString & /*vm*/, + const OFBool /*oldFormat*/) +{ + /* currently no checks are performed */ + return EC_Normal; +} + + +unsigned long DcmOther64bitVeryLong::getVM() +{ + /* value multiplicity for OV is defined as 1 */ + return 1; +} + + +// ******************************** + + +OFCondition DcmOther64bitVeryLong::writeXML(STD_NAMESPACE ostream &out, + const size_t flags) +{ + /* always write XML start tag */ + writeXMLStartTag(out, flags); + /* OV data requires special handling in the Native DICOM Model format */ + if (flags & DCMTypes::XF_useNativeModel) + { + /* for an empty value field, we do not need to do anything */ + if (getLengthField() > 0) + { + /* encode binary data as Base64 */ + if (flags & DCMTypes::XF_encodeBase64) + { + out << ""; + Uint8 *byteValues = OFstatic_cast(Uint8 *, getValue()); + /* Base64 encoder requires big endian input data */ + swapIfNecessary(EBO_BigEndian, gLocalByteOrder, byteValues, getLengthField(), sizeof(Uint64)); + /* update the byte order indicator variable correspondingly */ + setByteOrder(EBO_BigEndian); + OFStandard::encodeBase64(out, byteValues, OFstatic_cast(size_t, getLengthField())); + out << "" << OFendl; + } else { + /* generate a new UID but the binary data is not (yet) written. */ + OFUUID uuid; + out << "" << OFendl; + } + } + } else { + /* write element value (if loaded) */ + if (valueLoaded()) + { + Uint64 *uintVals = NULL; + /* get and check 64 bit data */ + if (getUint64Array(uintVals).good() && (uintVals != NULL)) + { + const size_t count = getNumberOfValues(); + /* count can be zero if we have an invalid element with less than eight bytes length */ + if (count > 0) + { + /* print unsigned long values in hex mode */ + out << (*(uintVals++)); + for (unsigned long i = 1; i < count; i++) + out << "\\" << (*(uintVals++)); + } + } + } + } + /* always write XML end tag */ + writeXMLEndTag(out, flags); + /* always report success */ + return EC_Normal; +} + + +// ******************************** + + +OFCondition DcmOther64bitVeryLong::writeJson(STD_NAMESPACE ostream &out, + DcmJsonFormat &format) +{ + /* write JSON Opener */ + writeJsonOpener(out, format); + /* for an empty value field, we do not need to do anything */ + if (getLengthField() > 0) + { + OFString value; + if (format.asBulkDataURI(getTag(), value)) + { + /* return defined BulkDataURI */ + format.printBulkDataURIPrefix(out); + DcmJsonFormat::printString(out, value); + } + else + { + /* encode binary data as Base64 */ + format.printInlineBinaryPrefix(out); + out << "\""; + Uint8 *byteValues = OFstatic_cast(Uint8 *, getValue()); + OFStandard::encodeBase64(out, byteValues, OFstatic_cast(size_t, getLengthField())); + out << "\""; + } + } + /* write JSON Closer */ + writeJsonCloser(out, format); + /* always report success */ + return EC_Normal; +} + + +// ******************************** + + +OFCondition DcmOther64bitVeryLong::createUint64Array(const Uint32 numQuadWords, + Uint64 *&quadWords) +{ + Uint32 bytesRequired = 0; + /* make sure that max length is not exceeded */ + if (OFStandard::safeMult(numQuadWords, OFstatic_cast(Uint32, sizeof(Uint64)), bytesRequired)) + errorFlag = createEmptyValue(bytesRequired); + else + errorFlag = EC_ElemLengthExceeds32BitField; + if (errorFlag.good()) + quadWords = OFstatic_cast(Uint64 *, this->getValue()); + else + quadWords = NULL; + return errorFlag; +} diff --git a/dcmdata/libsrc/dcvrpobw.cc b/dcmdata/libsrc/dcvrpobw.cc index 9d99a90b..67df5ee2 100644 --- a/dcmdata/libsrc/dcvrpobw.cc +++ b/dcmdata/libsrc/dcvrpobw.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2018, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -25,7 +25,6 @@ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ #include "dcmtk/dcmdata/dcvrpobw.h" - DcmPolymorphOBOW::DcmPolymorphOBOW( const DcmTag & tag, const Uint32 len) diff --git a/dcmdata/libsrc/dcvrsl.cc b/dcmdata/libsrc/dcvrsl.cc index 9da151a9..d4dc35f9 100644 --- a/dcmdata/libsrc/dcvrsl.cc +++ b/dcmdata/libsrc/dcvrsl.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -161,7 +161,7 @@ unsigned long DcmSignedLong::getNumberOfValues() // ******************************** -void DcmSignedLong::print(STD_NAMESPACE ostream&out, +void DcmSignedLong::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char * /*pixelFileName*/, diff --git a/dcmdata/libsrc/dcvrss.cc b/dcmdata/libsrc/dcvrss.cc index 55c0fbf4..ba0665d2 100644 --- a/dcmdata/libsrc/dcvrss.cc +++ b/dcmdata/libsrc/dcvrss.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -160,7 +160,7 @@ unsigned long DcmSignedShort::getNumberOfValues() // ******************************** -void DcmSignedShort::print(STD_NAMESPACE ostream&out, +void DcmSignedShort::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char * /*pixelFileName*/, diff --git a/dcmdata/libsrc/dcvrsv.cc b/dcmdata/libsrc/dcvrsv.cc new file mode 100644 index 00000000..6360a570 --- /dev/null +++ b/dcmdata/libsrc/dcvrsv.cc @@ -0,0 +1,396 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: Implementation of class DcmSigned64bitVeryLong + * + */ + + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/ofstd/ofstream.h" +#include "dcmtk/dcmdata/dcvrsv.h" + +#define INCLUDE_CSTDIO +#define INCLUDE_CSTRING +#define INCLUDE_CINTTYPES +#include "dcmtk/ofstd/ofstdinc.h" + + +// ******************************** + + +DcmSigned64bitVeryLong::DcmSigned64bitVeryLong(const DcmTag &tag) + : DcmElement(tag, 0) +{ +} + + +DcmSigned64bitVeryLong::DcmSigned64bitVeryLong(const DcmTag &tag, + const Uint32 len) + : DcmElement(tag, len) +{ +} + + +DcmSigned64bitVeryLong::DcmSigned64bitVeryLong(const DcmSigned64bitVeryLong &old) + : DcmElement(old) +{ +} + + +DcmSigned64bitVeryLong::~DcmSigned64bitVeryLong() +{ +} + + +DcmSigned64bitVeryLong &DcmSigned64bitVeryLong::operator=(const DcmSigned64bitVeryLong &obj) +{ + DcmElement::operator=(obj); + return *this; +} + + +int DcmSigned64bitVeryLong::compare(const DcmElement& rhs) const +{ + int result = DcmElement::compare(rhs); + if (result != 0) + { + return result; + } + + /* cast away constness (dcmdata is not const correct...) */ + DcmSigned64bitVeryLong* myThis = NULL; + DcmSigned64bitVeryLong* myRhs = NULL; + myThis = OFconst_cast(DcmSigned64bitVeryLong*, this); + myRhs = OFstatic_cast(DcmSigned64bitVeryLong*, OFconst_cast(DcmElement*, &rhs)); + + /* compare number of values */ + unsigned long thisNumValues = myThis->getNumberOfValues(); + unsigned long rhsNumValues = myRhs->getNumberOfValues(); + if (thisNumValues < rhsNumValues) + { + return -1; + } + else if (thisNumValues > rhsNumValues) + { + return 1; + } + + /* iterate over all components and test equality */ + for (unsigned long count = 0; count < thisNumValues; count++) + { + Sint64 val = 0; + if (myThis->getSint64(val, count).good()) + { + Sint64 rhsVal = 0; + if (myRhs->getSint64(rhsVal, count).good()) + { + if (val > rhsVal) + { + return 1; + } + else if (val < rhsVal) + { + return -1; + } + /* otherwise they are equal, continue comparison */ + } + } + } + + /* all values as well as VM equal: objects are equal */ + return 0; +} + + +OFCondition DcmSigned64bitVeryLong::copyFrom(const DcmObject& rhs) +{ + if (this != &rhs) + { + if (rhs.ident() != ident()) return EC_IllegalCall; + *this = OFstatic_cast(const DcmSigned64bitVeryLong &, rhs); + } + return EC_Normal; +} + + +// ******************************** + + +DcmEVR DcmSigned64bitVeryLong::ident() const +{ + return EVR_SV; +} + + +OFCondition DcmSigned64bitVeryLong::checkValue(const OFString &vm, + const OFBool /*oldFormat*/) +{ + /* check VM only */ + return DcmElement::checkVM(getVM(), vm); +} + + +unsigned long DcmSigned64bitVeryLong::getVM() +{ + return getNumberOfValues(); +} + + +unsigned long DcmSigned64bitVeryLong::getNumberOfValues() +{ + return OFstatic_cast(unsigned long, getLengthField() / sizeof(Sint64)); +} + + +// ******************************** + + +void DcmSigned64bitVeryLong::print(STD_NAMESPACE ostream &out, + const size_t flags, + const int level, + const char * /*pixelFileName*/, + size_t * /*pixelCounter*/) +{ + if (valueLoaded()) + { + /* get signed integer data */ + Sint64 *sintVals; + errorFlag = getSint64Array(sintVals); + if (sintVals != NULL) + { + const unsigned long count = getNumberOfValues(); + /* double-check length field for valid value */ + if (count > 0) + { + const unsigned long maxLength = (flags & DCMTypes::PF_shortenLongTagValues) ? + DCM_OptPrintLineLength : OFstatic_cast(unsigned long, -1) /*unlimited*/; + unsigned long printedLength = 0; + unsigned long newLength = 0; + char buffer[32]; + /* print line start with tag and VR */ + printInfoLineStart(out, flags, level); + /* print multiple values */ + for (unsigned int i = 0; i < count; i++, sintVals++) + { + /* check whether first value is printed (omit delimiter) */ +#ifdef PRId64 + if (i == 0) + sprintf(buffer, "%" PRId64, *sintVals); + else + sprintf(buffer, "\\%" PRId64, *sintVals); +#elif SIZEOF_LONG == 8 + if (i == 0) + sprintf(buffer, "%ld", *sintVals); + else + sprintf(buffer, "\\%ld", *sintVals); +#else // assume "long long" is 64 bits + if (i == 0) + sprintf(buffer, "%lld", *sintVals); + else + sprintf(buffer, "\\%lld", *sintVals); +#endif + /* check whether current value sticks to the length limit */ + newLength = printedLength + OFstatic_cast(unsigned long, strlen(buffer)); + if ((newLength <= maxLength) && ((i + 1 == count) || (newLength + 3 <= maxLength))) + { + out << buffer; + printedLength = newLength; + } else { + /* check whether output has been truncated */ + if (i + 1 < count) + { + out << "..."; + printedLength += 3; + } + break; + } + } + /* print line end with length, VM and tag name */ + printInfoLineEnd(out, flags, printedLength); + } else { + /* count can be zero if we have an invalid element with less than eight bytes length */ + printInfoLine(out, flags, level, "(invalid value)"); + } + } else + printInfoLine(out, flags, level, "(no value available)"); + } else + printInfoLine(out, flags, level, "(not loaded)"); +} + + +// ******************************** + + +OFCondition DcmSigned64bitVeryLong::getSint64(Sint64 &sintVal, + const unsigned long pos) +{ + /* get signed integer data */ + Sint64 *sintValues = NULL; + errorFlag = getSint64Array(sintValues); + /* check data before returning */ + if (errorFlag.good()) + { + if (sintValues == NULL) + errorFlag = EC_IllegalCall; + else if (pos >= getVM()) + errorFlag = EC_IllegalParameter; + else + sintVal = sintValues[pos]; + } + /* clear value in case of error */ + if (errorFlag.bad()) + sintVal = 0; + return errorFlag; +} + + +OFCondition DcmSigned64bitVeryLong::getSint64Array(Sint64 *&sintVals) +{ + sintVals = OFstatic_cast(Sint64 *, getValue()); + return errorFlag; +} + + +// ******************************** + + +OFCondition DcmSigned64bitVeryLong::getOFString(OFString &stringVal, + const unsigned long pos, + OFBool /*normalize*/) +{ + Sint64 sintVal; + /* get the specified numeric value */ + errorFlag = getSint64(sintVal, pos); + if (errorFlag.good()) + { + /* ... and convert it to a character string */ + char buffer[32]; +#ifdef PRId64 + sprintf(buffer, "%" PRId64, sintVal); +#elif SIZEOF_LONG == 8 + sprintf(buffer, "%ld", sintVal); +#else // assume "long long" is 64 bits + sprintf(buffer, "%lld", sintVal); +#endif + /* assign result */ + stringVal = buffer; + } + return errorFlag; +} + + +// ******************************** + + +OFCondition DcmSigned64bitVeryLong::putSint64(const Sint64 sintVal, + const unsigned long pos) +{ + Sint64 val = sintVal; + errorFlag = changeValue(&val, OFstatic_cast(Uint32, sizeof(Sint64) * pos), OFstatic_cast(Uint32, sizeof(Sint64))); + return errorFlag; +} + + +OFCondition DcmSigned64bitVeryLong::putSint64Array(const Sint64 *sintVals, + const unsigned long numSints) +{ + errorFlag = EC_Normal; + if (numSints > 0) + { + /* check for valid data */ + if (sintVals != NULL) + errorFlag = putValue(sintVals, OFstatic_cast(Uint32, sizeof(Sint64) * OFstatic_cast(size_t, numSints))); + else + errorFlag = EC_CorruptedData; + } else + errorFlag = putValue(NULL, 0); + return errorFlag; +} + + +// ******************************** + + +OFCondition DcmSigned64bitVeryLong::putString(const char *stringVal) +{ + /* determine length of the string value */ + const size_t stringLen = (stringVal != NULL) ? strlen(stringVal) : 0; + /* call the real function */ + return putString(stringVal, OFstatic_cast(Uint32, stringLen)); +} + + +OFCondition DcmSigned64bitVeryLong::putString(const char *stringVal, + const Uint32 stringLen) +{ + errorFlag = EC_Normal; + /* determine VM of the string */ + const unsigned long vm = DcmElement::determineVM(stringVal, stringLen); + if (vm > 0) + { + Sint64 *field = new Sint64[vm]; + OFString value; + size_t pos = 0; + /* retrieve signed integer data from character string */ + for (unsigned long i = 0; (i < vm) && errorFlag.good(); i++) + { + /* get specified value from multi-valued string */ + pos = DcmElement::getValueFromString(stringVal, pos, stringLen, value); + if (value.empty() || +#ifdef SCNd64 + (sscanf(value.c_str(), "%" SCNd64, &field[i]) != 1) +#elif SIZEOF_LONG == 8 + (sscanf(value.c_str(), "%ld", &field[i]) != 1) +#else // assume "long long" is 64 bits + (sscanf(value.c_str(), "%lld", &field[i]) != 1) +#endif + ) + { + errorFlag = EC_CorruptedData; + } + } + /* set binary data as the element value */ + if (errorFlag.good()) + errorFlag = putSint64Array(field, vm); + /* delete temporary buffer */ + delete[] field; + } else + errorFlag = putValue(NULL, 0); + return errorFlag; +} + + +// ******************************** + + +OFCondition DcmSigned64bitVeryLong::verify(const OFBool autocorrect) +{ + /* check for valid value length */ + if (getLengthField() % (sizeof(Sint64)) != 0) + { + errorFlag = EC_CorruptedData; + if (autocorrect) + { + /* strip to valid length */ + setLengthField(getLengthField() - (getLengthField() % OFstatic_cast(Uint32, sizeof(Sint64)))); + } + } else + errorFlag = EC_Normal; + return errorFlag; +} diff --git a/dcmdata/libsrc/dcvrul.cc b/dcmdata/libsrc/dcvrul.cc index bc92c533..aa22f5e0 100644 --- a/dcmdata/libsrc/dcvrul.cc +++ b/dcmdata/libsrc/dcvrul.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -160,7 +160,7 @@ unsigned long DcmUnsignedLong::getNumberOfValues() // ******************************** -void DcmUnsignedLong::print(STD_NAMESPACE ostream&out, +void DcmUnsignedLong::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char * /*pixelFileName*/, diff --git a/dcmdata/libsrc/dcvrus.cc b/dcmdata/libsrc/dcvrus.cc index 81fa2ec0..da91f354 100644 --- a/dcmdata/libsrc/dcvrus.cc +++ b/dcmdata/libsrc/dcvrus.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -157,7 +157,7 @@ unsigned long DcmUnsignedShort::getNumberOfValues() // ******************************** -void DcmUnsignedShort::print(STD_NAMESPACE ostream&out, +void DcmUnsignedShort::print(STD_NAMESPACE ostream &out, const size_t flags, const int level, const char * /*pixelFileName*/, diff --git a/dcmdata/libsrc/dcvruv.cc b/dcmdata/libsrc/dcvruv.cc new file mode 100644 index 00000000..501a2902 --- /dev/null +++ b/dcmdata/libsrc/dcvruv.cc @@ -0,0 +1,395 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: Implementation of class DcmUnsigned64bitVeryLong + * + */ + + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/ofstd/ofstream.h" +#include "dcmtk/dcmdata/dcvruv.h" + +#define INCLUDE_CSTDIO +#define INCLUDE_CSTRING +#define INCLUDE_CINTTYPES +#include "dcmtk/ofstd/ofstdinc.h" + + +// ******************************** + + +DcmUnsigned64bitVeryLong::DcmUnsigned64bitVeryLong(const DcmTag &tag) + : DcmElement(tag, 0) +{ +} + + +DcmUnsigned64bitVeryLong::DcmUnsigned64bitVeryLong(const DcmTag &tag, + const Uint32 len) + : DcmElement(tag, len) +{ +} + + +DcmUnsigned64bitVeryLong::DcmUnsigned64bitVeryLong(const DcmUnsigned64bitVeryLong &old) + : DcmElement(old) +{ +} + + +DcmUnsigned64bitVeryLong::~DcmUnsigned64bitVeryLong() +{ +} + + +DcmUnsigned64bitVeryLong &DcmUnsigned64bitVeryLong::operator=(const DcmUnsigned64bitVeryLong &obj) +{ + DcmElement::operator=(obj); + return *this; +} + + +int DcmUnsigned64bitVeryLong::compare(const DcmElement& rhs) const +{ + int result = DcmElement::compare(rhs); + if (result != 0) + { + return result; + } + + /* cast away constness (dcmdata is not const correct...) */ + DcmUnsigned64bitVeryLong* myThis = NULL; + DcmUnsigned64bitVeryLong* myRhs = NULL; + myThis = OFconst_cast(DcmUnsigned64bitVeryLong*, this); + myRhs = OFstatic_cast(DcmUnsigned64bitVeryLong*, OFconst_cast(DcmElement*, &rhs)); + + /* compare number of values */ + unsigned long thisNumValues = myThis->getNumberOfValues(); + unsigned long rhsNumValues = myRhs->getNumberOfValues(); + if (thisNumValues < rhsNumValues) + { + return -1; + } + else if (thisNumValues > rhsNumValues) + { + return 1; + } + + /* iterate over all components and test equality */ + for (unsigned long count = 0; count < thisNumValues; count++) + { + Uint64 val = 0; + if (myThis->getUint64(val, count).good()) + { + Uint64 rhsVal = 0; + if (myRhs->getUint64(rhsVal, count).good()) + { + if (val > rhsVal) + { + return 1; + } + else if (val < rhsVal) + { + return -1; + } + } + } + } + + /* all values as well as VM equal: objects are equal */ + return 0; +} + + +OFCondition DcmUnsigned64bitVeryLong::copyFrom(const DcmObject& rhs) +{ + if (this != &rhs) + { + if (rhs.ident() != ident()) return EC_IllegalCall; + *this = OFstatic_cast(const DcmUnsigned64bitVeryLong &, rhs); + } + return EC_Normal; +} + + +// ******************************** + + +DcmEVR DcmUnsigned64bitVeryLong::ident() const +{ + return EVR_UV; +} + + +OFCondition DcmUnsigned64bitVeryLong::checkValue(const OFString &vm, + const OFBool /*oldFormat*/) +{ + /* check VM only */ + return DcmElement::checkVM(getVM(), vm); +} + + +unsigned long DcmUnsigned64bitVeryLong::getVM() +{ + return getNumberOfValues(); +} + + +unsigned long DcmUnsigned64bitVeryLong::getNumberOfValues() +{ + return OFstatic_cast(unsigned long, getLengthField() / sizeof(Uint64)); +} + + +// ******************************** + + +void DcmUnsigned64bitVeryLong::print(STD_NAMESPACE ostream &out, + const size_t flags, + const int level, + const char * /*pixelFileName*/, + size_t * /*pixelCounter*/) +{ + if (valueLoaded()) + { + /* get unsigned integer data */ + Uint64 *uintVals; + errorFlag = getUint64Array(uintVals); + if (uintVals != NULL) + { + /* do not use getVM() because derived classes might always return 1 */ + const unsigned long count = getNumberOfValues(); + /* double-check length field for valid value */ + if (count > 0) + { + const unsigned long maxLength = (flags & DCMTypes::PF_shortenLongTagValues) ? + DCM_OptPrintLineLength : OFstatic_cast(unsigned long, -1) /*unlimited*/; + unsigned long printedLength = 0; + unsigned long newLength = 0; + char buffer[32]; + /* print line start with tag and VR */ + printInfoLineStart(out, flags, level); + /* print multiple values */ + for (unsigned int i = 0; i < count; i++, uintVals++) + { + /* check whether first value is printed (omit delimiter) */ + if (i == 0) +#ifdef PRIu64 + sprintf(buffer, "%" PRIu64, *uintVals); + else + sprintf(buffer, "\\%" PRIu64, *uintVals); +#elif SIZEOF_LONG == 8 + sprintf(buffer, "%lu", *uintVals); + else + sprintf(buffer, "\\%lu", *uintVals); +#else // assume "long long" is 64 bits + sprintf(buffer, "%llu", *uintVals); + else + sprintf(buffer, "\\%llu", *uintVals); +#endif + /* check whether current value sticks to the length limit */ + newLength = printedLength + OFstatic_cast(unsigned long, strlen(buffer)); + if ((newLength <= maxLength) && ((i + 1 == count) || (newLength + 3 <= maxLength))) + { + out << buffer; + printedLength = newLength; + } else { + /* check whether output has been truncated */ + if (i + 1 < count) + { + out << "..."; + printedLength += 3; + } + break; + } + } + /* print line end with length, VM and tag name */ + printInfoLineEnd(out, flags, printedLength); + } else { + /* count can be zero if we have an invalid element with less than eight bytes length */ + printInfoLine(out, flags, level, "(invalid value)"); + } + } else + printInfoLine(out, flags, level, "(no value available)"); + } else + printInfoLine(out, flags, level, "(not loaded)"); +} + + +// ******************************** + + +OFCondition DcmUnsigned64bitVeryLong::getUint64(Uint64 &uintVal, + const unsigned long pos) +{ + /* get unsigned integer data */ + Uint64 *uintValues = NULL; + errorFlag = getUint64Array(uintValues); + /* check data before returning */ + if (errorFlag.good()) + { + if (uintValues == NULL) + errorFlag = EC_IllegalCall; + /* do not use getVM() because derived classes might always return 1 */ + else if (pos >= getNumberOfValues()) + errorFlag = EC_IllegalParameter; + else + uintVal = uintValues[pos]; + } + /* clear value in case of error */ + if (errorFlag.bad()) + uintVal = 0; + return errorFlag; +} + + +OFCondition DcmUnsigned64bitVeryLong::getUint64Array(Uint64 *&uintVals) +{ + uintVals = OFstatic_cast(Uint64 *, getValue()); + return errorFlag; +} + + +// ******************************** + + +OFCondition DcmUnsigned64bitVeryLong::getOFString(OFString &stringVal, + const unsigned long pos, + OFBool /*normalize*/) +{ + Uint64 uintVal; + /* get the specified numeric value */ + errorFlag = getUint64(uintVal, pos); + if (errorFlag.good()) + { + /* ... and convert it to a character string */ + char buffer[32]; +#ifdef PRIu64 + sprintf(buffer, "%" PRIu64, uintVal); +#elif SIZEOF_LONG == 8 + sprintf(buffer, "%lu", uintVal); +#else // assume "long long" is 64 bits + sprintf(buffer, "%llu", uintVal); +#endif + /* assign result */ + stringVal = buffer; + } + return errorFlag; +} + + +// ******************************** + + +OFCondition DcmUnsigned64bitVeryLong::putUint64(const Uint64 uintVal, + const unsigned long pos) +{ + Uint64 val = uintVal; + errorFlag = changeValue(&val, OFstatic_cast(Uint32, sizeof(Uint64) * pos), OFstatic_cast(Uint32, sizeof(Uint64))); + return errorFlag; +} + + +OFCondition DcmUnsigned64bitVeryLong::putUint64Array(const Uint64 *uintVals, + const unsigned long numUints) +{ + errorFlag = EC_Normal; + if (numUints > 0) + { + /* check for valid data */ + if (uintVals != NULL) + errorFlag = putValue(uintVals, OFstatic_cast(Uint32, sizeof(Uint64) * OFstatic_cast(size_t, numUints))); + else + errorFlag = EC_CorruptedData; + } else + errorFlag = putValue(NULL, 0); + return errorFlag; +} + + +// ******************************** + + +OFCondition DcmUnsigned64bitVeryLong::putString(const char *stringVal) +{ + /* determine length of the string value */ + const size_t stringLen = (stringVal != NULL) ? strlen(stringVal) : 0; + /* call the real function */ + return putString(stringVal, OFstatic_cast(Uint32, stringLen)); +} + + +OFCondition DcmUnsigned64bitVeryLong::putString(const char *stringVal, + const Uint32 stringLen) +{ + errorFlag = EC_Normal; + /* determine VM of the string */ + const unsigned long vm = DcmElement::determineVM(stringVal, stringLen); + if (vm > 0) + { + Uint64 *field = new Uint64[vm]; + OFString value; + size_t pos = 0; + /* retrieve unsigned integer data from character string */ + for (unsigned long i = 0; (i < vm) && errorFlag.good(); i++) + { + /* get specified value from multi-valued string */ + pos = DcmElement::getValueFromString(stringVal, pos, stringLen, value); + if (value.empty() || +#ifdef SCNu64 + (sscanf(value.c_str(), "%" SCNu64, &field[i]) != 1) +#elif SIZEOF_LONG == 8 + (sscanf(value.c_str(), "%lu", &field[i]) != 1) +#else // assume "long long" is 64 bits + (sscanf(value.c_str(), "%llu", &field[i]) != 1) +#endif + ) + { + errorFlag = EC_CorruptedData; + } + } + /* set binary data as the element value */ + if (errorFlag.good()) + errorFlag = putUint64Array(field, vm); + /* delete temporary buffer */ + delete[] field; + } else + errorFlag = putValue(NULL, 0); + return errorFlag; +} + + +// ******************************** + + +OFCondition DcmUnsigned64bitVeryLong::verify(const OFBool autocorrect) +{ + /* check for valid value length */ + if (getLengthField() % (sizeof(Uint64)) != 0) + { + errorFlag = EC_CorruptedData; + if (autocorrect) + { + /* strip to valid length */ + setLengthField(getLengthField() - (getLengthField() % OFstatic_cast(Uint32, sizeof(Uint64)))); + } + } else + errorFlag = EC_Normal; + return errorFlag; +} diff --git a/dcmdata/tests/CMakeLists.txt b/dcmdata/tests/CMakeLists.txt index 0d7c0d60..c1a1c6c4 100644 --- a/dcmdata/tests/CMakeLists.txt +++ b/dcmdata/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # declare executables -DCMTK_ADD_EXECUTABLE(dcmdata_tests tests tpread ti2dbmp tchval tpath tvrdatim telemlen tparser tdict tvrds tvrfd tvrpn tvrui tvrol tstrval tspchrs tparent tfilter tvrcomp tmatch tnewdcme tgenuid) +DCMTK_ADD_EXECUTABLE(dcmdata_tests tests tpread ti2dbmp tchval tpath tvrdatim telemlen tparser tdict tvrds tvrfd tvrpn tvrui tvrol tvrov tvrsv tvruv tstrval tspchrs tparent tfilter tvrcomp tmatch tnewdcme tgenuid) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmdata_tests i2d dcmdata oflog ofstd) diff --git a/dcmdata/tests/Makefile.dep b/dcmdata/tests/Makefile.dep index e48aeb8b..6f141c65 100644 --- a/dcmdata/tests/Makefile.dep +++ b/dcmdata/tests/Makefile.dep @@ -80,10 +80,11 @@ tchval.o: tchval.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/vrscan.h \ + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/vrscan.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h tdict.o: tdict.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ @@ -219,10 +220,12 @@ telemlen.o: telemlen.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcpxitem.h ../include/dcmtk/dcmdata/dcostrmb.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcpxitem.h \ + ../include/dcmtk/dcmdata/dcostrmb.h tests.o: tests.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ @@ -622,11 +625,12 @@ tparent.o: tparent.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - dctmacro.h ../include/dcmtk/dcmdata/dcistrmb.h \ - ../include/dcmtk/dcmdata/dcostrmb.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h dctmacro.h \ + ../include/dcmtk/dcmdata/dcistrmb.h ../include/dcmtk/dcmdata/dcostrmb.h tparser.o: tparser.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ @@ -710,11 +714,13 @@ tparser.o: tparser.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcpxitem.h ../include/dcmtk/dcmdata/dcistrmb.h \ - ../include/dcmtk/dcmdata/dcostrmb.h dctmacro.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcpxitem.h \ + ../include/dcmtk/dcmdata/dcistrmb.h ../include/dcmtk/dcmdata/dcostrmb.h \ + dctmacro.h tpath.o: tpath.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ @@ -797,10 +803,11 @@ tpath.o: tpath.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcpath.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcpath.h tpread.o: tpread.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ @@ -884,11 +891,12 @@ tpread.o: tpread.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrpobw.h ../include/dcmtk/dcmdata/dcovlay.h \ ../include/dcmtk/dcmdata/dcvrat.h ../include/dcmtk/dcmdata/dcvrss.h \ ../include/dcmtk/dcmdata/dcvrus.h ../include/dcmtk/dcmdata/dcvrsl.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcvruv.h \ ../include/dcmtk/dcmdata/dcvrfl.h ../include/dcmtk/dcmdata/dcvrfd.h \ ../include/dcmtk/dcmdata/dcvrof.h ../include/dcmtk/dcmdata/dcvrod.h \ - ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/cmdlnarg.h \ - ../include/dcmtk/dcmdata/dcostrmz.h ../include/dcmtk/dcmdata/dcistrmz.h \ - ../include/dcmtk/dcmdata/dcfcache.h + ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrov.h \ + ../include/dcmtk/dcmdata/cmdlnarg.h ../include/dcmtk/dcmdata/dcostrmz.h \ + ../include/dcmtk/dcmdata/dcistrmz.h ../include/dcmtk/dcmdata/dcfcache.h tspchrs.o: tspchrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ @@ -1053,8 +1061,8 @@ tvrcomp.o: tvrcomp.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvrae.h ../include/dcmtk/dcmdata/dcchrstr.h \ ../include/dcmtk/dcmdata/dcvrlo.h ../include/dcmtk/dcmdata/dcvrlt.h \ ../include/dcmtk/dcmdata/dcvrpn.h ../include/dcmtk/dcmdata/dcvrst.h \ - ../include/dcmtk/dcmdata/dcvrut.h ../include/dcmtk/dcmdata/dcvrcs.h \ - ../include/dcmtk/dcmdata/dcvrda.h \ + ../include/dcmtk/dcmdata/dcvrur.h ../include/dcmtk/dcmdata/dcvrut.h \ + ../include/dcmtk/dcmdata/dcvrcs.h ../include/dcmtk/dcmdata/dcvrda.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../include/dcmtk/dcmdata/dcvrdt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ @@ -1302,6 +1310,63 @@ tvrol.o: tvrol.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmdata/dcvrol.h ../include/dcmtk/dcmdata/dcvrul.h \ ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcdeftag.h +tvrov.o: tvrov.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dcdefine.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dctypes.h ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcvrov.h ../include/dcmtk/dcmdata/dcvruv.h \ + ../include/dcmtk/dcmdata/dcelem.h ../include/dcmtk/dcmdata/dcdeftag.h tvrpn.o: tvrpn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ @@ -1357,6 +1422,62 @@ tvrpn.o: tvrpn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h +tvrsv.o: tvrsv.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dcdefine.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dctypes.h ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcvrsv.h ../include/dcmtk/dcmdata/dcelem.h tvrui.o: tvrui.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ @@ -1413,3 +1534,59 @@ tvrui.o: tvrui.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ ../include/dcmtk/dcmdata/dcdeftag.h +tvruv.o: tvruv.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../include/dcmtk/dcmdata/dcuid.h ../include/dcmtk/dcmdata/dcdefine.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../include/dcmtk/dcmdata/dcdatset.h ../include/dcmtk/dcmdata/dcitem.h \ + ../include/dcmtk/dcmdata/dctypes.h ../include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmdata/dcerror.h ../include/dcmtk/dcmdata/dcxfer.h \ + ../include/dcmtk/dcmdata/dcvr.h ../include/dcmtk/dcmdata/dctag.h \ + ../include/dcmtk/dcmdata/dctagkey.h ../include/dcmtk/dcmdata/dcstack.h \ + ../include/dcmtk/dcmdata/dclist.h ../include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmdata/dcvruv.h ../include/dcmtk/dcmdata/dcelem.h diff --git a/dcmdata/tests/Makefile.in b/dcmdata/tests/Makefile.in index 247d6cd5..eb003974 100644 --- a/dcmdata/tests/Makefile.in +++ b/dcmdata/tests/Makefile.in @@ -22,8 +22,9 @@ LOCALLIBS = -ldcmdata -loflog -lofstd $(ZLIBLIBS) $(CHARCONVLIBS) $(MATHLIBS) I2DLIBS = -li2d objs = tests.o tpread.o ti2dbmp.o tchval.o tpath.o tvrdatim.o telemlen.o tparser.o \ - tdict.o tvrds.o tvrfd.o tvrui.o tvrol.o tstrval.o tspchrs.o tvrpn.o \ - tparent.o tfilter.o tvrcomp.o tmatch.o tnewdcme.o tgenuid.o + tdict.o tvrds.o tvrfd.o tvrui.o tvrol.o tvrov.o tvrsv.o tvruv.o tstrval.o \ + tspchrs.o tvrpn.o tparent.o tfilter.o tvrcomp.o tmatch.o tnewdcme.o \ + tgenuid.o progs = tests diff --git a/dcmdata/tests/telemlen.cc b/dcmdata/tests/telemlen.cc index 4b094ad2..d275eff8 100644 --- a/dcmdata/tests/telemlen.cc +++ b/dcmdata/tests/telemlen.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011-2016, OFFIS e.V. + * Copyright (C) 2011-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -112,7 +112,10 @@ TEST_VR(EVR_OB) TEST_VR(EVR_OD) TEST_VR(EVR_OF) TEST_VR(EVR_OL) +TEST_VR(EVR_OV) TEST_VR(EVR_OW) +TEST_VR(EVR_SV) +TEST_VR(EVR_UV) TEST_VR(EVR_SQ) TEST_VR(EVR_UC) TEST_VR(EVR_UR) diff --git a/dcmdata/tests/tests.cc b/dcmdata/tests/tests.cc index 8c849ba6..f6cb826e 100644 --- a/dcmdata/tests/tests.cc +++ b/dcmdata/tests/tests.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011-2017 OFFIS e.V. + * Copyright (C) 2011-2019 OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -39,6 +39,9 @@ OFTEST_REGISTER(dcmdata_personName); OFTEST_REGISTER(dcmdata_uniqueIdentifier_1); OFTEST_REGISTER(dcmdata_uniqueIdentifier_2); OFTEST_REGISTER(dcmdata_otherLong); +OFTEST_REGISTER(dcmdata_other64bitVeryLong); +OFTEST_REGISTER(dcmdata_signed64bitVeryLong); +OFTEST_REGISTER(dcmdata_unsigned64bitVeryLong); OFTEST_REGISTER(dcmdata_VRCompare); OFTEST_REGISTER(dcmdata_elementLength_EVR_AE); OFTEST_REGISTER(dcmdata_elementLength_EVR_AS); @@ -56,6 +59,7 @@ OFTEST_REGISTER(dcmdata_elementLength_EVR_OB); OFTEST_REGISTER(dcmdata_elementLength_EVR_OD); OFTEST_REGISTER(dcmdata_elementLength_EVR_OF); OFTEST_REGISTER(dcmdata_elementLength_EVR_OL); +OFTEST_REGISTER(dcmdata_elementLength_EVR_OV); OFTEST_REGISTER(dcmdata_elementLength_EVR_OW); OFTEST_REGISTER(dcmdata_elementLength_EVR_OverlayData); OFTEST_REGISTER(dcmdata_elementLength_EVR_PN); @@ -65,6 +69,7 @@ OFTEST_REGISTER(dcmdata_elementLength_EVR_SL); OFTEST_REGISTER(dcmdata_elementLength_EVR_SQ); OFTEST_REGISTER(dcmdata_elementLength_EVR_SS); OFTEST_REGISTER(dcmdata_elementLength_EVR_ST); +OFTEST_REGISTER(dcmdata_elementLength_EVR_SV); OFTEST_REGISTER(dcmdata_elementLength_EVR_TM); OFTEST_REGISTER(dcmdata_elementLength_EVR_UC); OFTEST_REGISTER(dcmdata_elementLength_EVR_UI); @@ -74,6 +79,7 @@ OFTEST_REGISTER(dcmdata_elementLength_EVR_UNKNOWN); OFTEST_REGISTER(dcmdata_elementLength_EVR_UNKNOWN2B); OFTEST_REGISTER(dcmdata_elementLength_EVR_UR); OFTEST_REGISTER(dcmdata_elementLength_EVR_US); +OFTEST_REGISTER(dcmdata_elementLength_EVR_UV); OFTEST_REGISTER(dcmdata_elementLength_EVR_UT); OFTEST_REGISTER(dcmdata_elementLength_EVR_lt); OFTEST_REGISTER(dcmdata_elementLength_EVR_na); diff --git a/dcmdata/tests/tvrcomp.cc b/dcmdata/tests/tvrcomp.cc index 00164d75..a0b3cc73 100644 --- a/dcmdata/tests/tvrcomp.cc +++ b/dcmdata/tests/tvrcomp.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, OFFIS e.V. + * Copyright (C) 2015-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -31,6 +31,7 @@ #include "dcmtk/dcmdata/dcvrlt.h" #include "dcmtk/dcmdata/dcvrpn.h" #include "dcmtk/dcmdata/dcvrst.h" +#include "dcmtk/dcmdata/dcvrur.h" #include "dcmtk/dcmdata/dcvrut.h" #include "dcmtk/dcmdata/dcvras.h" #include "dcmtk/dcmdata/dcvrcs.h" @@ -70,20 +71,17 @@ template static void checkStringBased( const DcmTagKey& key, - const OFString& vrName, - const OFString shortVal, - const OFString longVal) + const OFString& shortVal, + const OFString& longVal) { // Start with equal values - OFString val1 = shortVal; - OFString val2 = shortVal; StringType obj1(key); StringType obj2(key); StringType objOtherTag(DCM_UndefinedTagKey); - - // Check equality obj1.putOFStringArray(shortVal); obj2.putOFStringArray(shortVal); + + // Check equality OFCHECK_EQUAL(obj1.compare(obj2), 0); OFCHECK( (obj1 <= obj2) && (obj2 <= obj1) ); // Reverse test should yield same result @@ -132,10 +130,10 @@ static void checkAttributeTags() DcmAttributeTag obj1(DCM_FrameIncrementPointer); DcmAttributeTag obj2(DCM_FrameIncrementPointer); DcmAttributeTag objOtherTag(DCM_UndefinedTagKey); - - // Check equality obj1.putTagVal(DCM_PatientName); obj2.putTagVal(DCM_PatientName); + + // Check equality OFCHECK_EQUAL(obj1.compare(obj2), 0); OFCHECK( (obj1 <= obj2) && (obj2 <= obj1) ); // Reverse test should yield same result @@ -850,31 +848,32 @@ OFTEST(dcmdata_VRCompare) // Check the different String-based VRs (in the sense that the method // putAndInsertOFStringArray() can be used by the test method for initializing // the test values. - // This applies to: AE, AS, CS, DA, DS, DT, FD, FL, IS, LO, LT, OD, OF,PN, SH, ST, - // TM, UC, UI, UT, - // Sometimes the maximum length of the VR is exceed deliberately to perform the test, - // which is even useful since on that level DCMTK allows invalid values - // in order to handle incorrect datasets. - checkStringBased(DCM_RetrieveAETitle, "AE", "AE1", "AE1_CT"); - checkStringBased(DCM_PatientAge, "AS", "008Y", "008YY"); - checkStringBased(DCM_BlendingMode, "CS", "SOME", "SOME_LONGER"); - checkStringBased(DCM_StudyDate, "DA", "19771212", "1977121200"); - checkStringBased(DCM_ProcedureStepProgress, "DS", "0.0", "0.01"); - checkStringBased(DCM_SOPAuthorizationDateTime, "DT", "19771212235900", "19771212235900.123456"); - checkStringBased(DCM_BeamDeliveryDurationLimit, "FD", "10", "10.5"); - checkStringBased(DCM_IsocenterToWedgeTrayDistance, "FL", "10", "10.5"); - checkStringBased(DCM_NumberOfWedges, "IS", "100", "1000"); - checkStringBased(DCM_SeriesDescription, "LO", "Description", "Description Long"); - checkStringBased(DCM_AdditionalPatientHistory, "LT", "Text", "Text Long"); - checkStringBased(DCM_DoubleFloatPixelData, "OD", "10", "10.5"); - checkStringBased(DCM_FloatPixelData, "OF", "10", "10.5"); - checkStringBased(DCM_OtherPatientNames, "PN", "Bond^James", "Bond^James^Jürgen"); - checkStringBased(DCM_WedgeID, "SH", "WEDGE1", "WEDGE1_LONG"); - checkStringBased(DCM_RTPlanDescription, "ST", "Text", "Text Long"); - checkStringBased(DCM_StudyTime, "TM", "235959", "235959.123456"); - checkStringBased(DCM_LongCodeValue, "UC", "Code_0815", "Code_0815_4711"); - checkStringBased(DCM_SOPInstanceUID, "UI", "1.2.3.4", "1.2.3.4.5"); - checkStringBased(DCM_RetrieveURL, "UR", "http://wwww.dcmtk.org", "http://www.dcmtk.org/dcmtk.php.en"); + // This applies to: AE, AS, CS, DA, DS, DT, FD, FL, IS, LO, LT, OD, OF, PN, + // SH, ST, TM, UC, UI, UR, UT. + // Sometimes the maximum length of the VR is exceed deliberately to perform + // the test, which is even useful since on that level DCMTK allows invalid + // values in order to handle incorrect datasets. + checkStringBased(DCM_RetrieveAETitle,"AE1", "AE1_CT"); + checkStringBased(DCM_PatientAge, "008Y", "008YY"); + checkStringBased(DCM_BlendingMode, "SOME", "SOME_LONGER"); + checkStringBased(DCM_StudyDate, "19771212", "1977121200"); + checkStringBased(DCM_ProcedureStepProgress, "0.0", "0.01"); + checkStringBased(DCM_SOPAuthorizationDateTime, "19771212235900", "19771212235900.123456"); + checkStringBased(DCM_BeamDeliveryDurationLimit, "10", "10.5"); + checkStringBased(DCM_IsocenterToWedgeTrayDistance, "10", "10.5"); + checkStringBased(DCM_NumberOfWedges, "100", "1000"); + checkStringBased(DCM_SeriesDescription, "Description", "Description Long"); + checkStringBased(DCM_AdditionalPatientHistory, "Text", "Text Long"); + checkStringBased(DCM_DoubleFloatPixelData, "10", "10.5"); + checkStringBased(DCM_FloatPixelData, "10", "10.5"); + checkStringBased(DCM_OtherPatientNames, "Bond^James", "Bond^James^T."); + checkStringBased(DCM_WedgeID, "WEDGE1", "WEDGE1_LONG"); + checkStringBased(DCM_RTPlanDescription, "Text", "Text Long"); + checkStringBased(DCM_StudyTime, "235959", "235959.123456"); + checkStringBased(DCM_LongCodeValue, "Code_0815", "Code_0815_4711"); + checkStringBased(DCM_SOPInstanceUID, "1.2.3.4", "1.2.3.4.5"); + checkStringBased(DCM_RetrieveURL, "http://wwww.dcmtk.org", "http://www.dcmtk.org/dcmtk.php.en"); + checkStringBased(DCM_TextValue, "Some (very long) text...", "Some (very long) text... hmm, not really."); // Check the rest checkAttributeTags(); @@ -890,5 +889,6 @@ OFTEST(dcmdata_VRCompare) checkDcmPixelDataNative(); checkDcmPixelDataEncapsulatedOB(); // UN is not represented by its own class but is handled by OB/OW VR - // code + + // The following, recently introduced VRs are not tested yet: OV, SV, UV. } diff --git a/dcmdata/tests/tvrov.cc b/dcmdata/tests/tvrov.cc new file mode 100644 index 00000000..c7eaf420 --- /dev/null +++ b/dcmdata/tests/tvrov.cc @@ -0,0 +1,50 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: test program for class DcmOther64bitVeryLong + * + */ + + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/ofstd/oftest.h" +#include "dcmtk/dcmdata/dcdatset.h" +#include "dcmtk/dcmdata/dcvrov.h" +#include "dcmtk/dcmdata/dcdeftag.h" + + +OFTEST(dcmdata_other64bitVeryLong) +{ + DcmOther64bitVeryLong veryLong(DCM_ExtendedOffsetTable); + /* append new values */ + OFCHECK(veryLong.putUint64(1, 0).good()); + OFCHECK(veryLong.putUint64(22, 1).good()); + OFCHECK(veryLong.putUint64(333, 2).good()); + OFCHECK(veryLong.putUint64(4444, 3).good()); + OFCHECK(veryLong.putUint64(55555, 4).good()); + OFCHECK(veryLong.putUint64(666666, 5).good()); + OFCHECK(veryLong.putUint64(7777777, 6).good()); + OFCHECK(veryLong.putUint64(88888888, 7).good()); + OFCHECK(veryLong.putUint64(999999999, 8).good()); + OFCHECK(veryLong.putUint64(1111111111, 9).good()); + OFCHECK(veryLong.putUint64(22222222222UL, 10).good()); + /* value multiplicity should always be 1 */ + OFCHECK_EQUAL(veryLong.getVM(), 1); + /* number of values should be higher */ + OFCHECK_EQUAL(veryLong.getNumberOfValues(), 11); +} diff --git a/dcmdata/tests/tvrsv.cc b/dcmdata/tests/tvrsv.cc new file mode 100644 index 00000000..b068af64 --- /dev/null +++ b/dcmdata/tests/tvrsv.cc @@ -0,0 +1,68 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: test program for class DcmSigned64bitVeryLong + * + */ + + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/ofstd/oftest.h" +#include "dcmtk/dcmdata/dcdatset.h" +#include "dcmtk/dcmdata/dcvrsv.h" +#include "dcmtk/dcmdata/dctagkey.h" + + +OFTEST(dcmdata_signed64bitVeryLong) +{ + Sint64 value; + DcmSigned64bitVeryLong veryLong(DcmTagKey(0x1111, 0x1111)); + /* append new values */ + OFCHECK(veryLong.putSint64(-2222, 0).good()); + OFCHECK(veryLong.putSint64(-11, 1).good()); + OFCHECK(veryLong.putSint64(0, 2).good()); + OFCHECK(veryLong.putSint64(11, 3).good()); + OFCHECK(veryLong.putSint64(2222, 4).good()); + /* check number of values */ + OFCHECK_EQUAL(veryLong.getVM(), 5); + /* check all set values */ + OFCHECK(veryLong.getSint64(value, 0).good()); + OFCHECK_EQUAL(value, -2222); + OFCHECK(veryLong.getSint64(value, 1).good()); + OFCHECK_EQUAL(value, -11); + OFCHECK(veryLong.getSint64(value, 2).good()); + OFCHECK_EQUAL(value, 0); + OFCHECK(veryLong.getSint64(value, 3).good()); + OFCHECK_EQUAL(value, 11); + OFCHECK(veryLong.getSint64(value, 4).good()); + OFCHECK_EQUAL(value, 2222); + /* change existing values */ + OFCHECK(veryLong.putSint64(-1111, 1).good()); + OFCHECK(veryLong.putSint64(1111, 3).good()); + /* check again all set values */ + OFCHECK(veryLong.getSint64(value, 0).good()); + OFCHECK_EQUAL(value, -2222); + OFCHECK(veryLong.getSint64(value, 1).good()); + OFCHECK_EQUAL(value, -1111); + OFCHECK(veryLong.getSint64(value, 2).good()); + OFCHECK_EQUAL(value, 0); + OFCHECK(veryLong.getSint64(value, 3).good()); + OFCHECK_EQUAL(value, 1111); + OFCHECK(veryLong.getSint64(value, 4).good()); + OFCHECK_EQUAL(value, 2222); +} diff --git a/dcmdata/tests/tvruv.cc b/dcmdata/tests/tvruv.cc new file mode 100644 index 00000000..38195042 --- /dev/null +++ b/dcmdata/tests/tvruv.cc @@ -0,0 +1,64 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmdata + * + * Author: Joerg Riesmeier + * + * Purpose: test program for class DcmUnsigned64bitVeryLong + * + */ + + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/ofstd/oftest.h" +#include "dcmtk/dcmdata/dcdatset.h" +#include "dcmtk/dcmdata/dcvruv.h" +#include "dcmtk/dcmdata/dctagkey.h" + + +OFTEST(dcmdata_unsigned64bitVeryLong) +{ + Uint64 value; + DcmUnsigned64bitVeryLong veryLong(DcmTagKey(0x1111, 0x1111)); + /* append new values */ + OFCHECK(veryLong.putUint64(1, 0).good()); + OFCHECK(veryLong.putUint64(22, 1).good()); + OFCHECK(veryLong.putUint64(333, 2).good()); + OFCHECK(veryLong.putUint64(4444, 3).good()); + OFCHECK(veryLong.putUint64(55555, 5).bad()); + /* check number of values */ + OFCHECK_EQUAL(veryLong.getVM(), 4); + /* check all set values */ + OFCHECK(veryLong.getUint64(value, 0).good()); + OFCHECK_EQUAL(value, 1); + OFCHECK(veryLong.getUint64(value, 1).good()); + OFCHECK_EQUAL(value, 22); + OFCHECK(veryLong.getUint64(value, 2).good()); + OFCHECK_EQUAL(value, 333); + OFCHECK(veryLong.getUint64(value, 3).good()); + OFCHECK_EQUAL(value, 4444); + /* change existing values */ + OFCHECK(veryLong.putUint64(2222, 1).good()); + OFCHECK(veryLong.putUint64(3333, 2).good()); + /* check again all set values */ + OFCHECK(veryLong.getUint64(value, 0).good()); + OFCHECK_EQUAL(value, 1); + OFCHECK(veryLong.getUint64(value, 1).good()); + OFCHECK_EQUAL(value, 2222); + OFCHECK(veryLong.getUint64(value, 2).good()); + OFCHECK_EQUAL(value, 3333); + OFCHECK(veryLong.getUint64(value, 3).good()); + OFCHECK_EQUAL(value, 4444); +} diff --git a/dcmfg/CMakeLists.txt b/dcmfg/CMakeLists.txt index bbd221b6..ca64875a 100644 --- a/dcmfg/CMakeLists.txt +++ b/dcmfg/CMakeLists.txt @@ -5,6 +5,6 @@ project(dcmfg) include_directories("${dcmfg_SOURCE_DIR}/include" "${dcmiod_SOURCE_DIR}/include" "${dcmdata_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include" "${oflog_SOURCE_DIR}/include" ${ZLIB_INCDIR}) # recurse into subdirectories -foreach(SUBDIR libsrc include) +foreach(SUBDIR libsrc include tests) add_subdirectory(${SUBDIR}) endforeach() diff --git a/dcmfg/Makefile.in b/dcmfg/Makefile.in index 9851281d..fb523c51 100644 --- a/dcmfg/Makefile.in +++ b/dcmfg/Makefile.in @@ -1,5 +1,5 @@ # -# Makefile for dcmiod +# Makefile for dcmfg # @SET_MAKE@ @@ -39,6 +39,7 @@ libsrc-all: include-all tests-all: libsrc-all (cd tests && $(MAKE) ARCH="$(ARCH)" all) + check: tests-all (cd tests && $(MAKE) check) @@ -82,4 +83,4 @@ distclean: dependencies: (cd libsrc && touch $(DEP) && $(MAKE) dependencies) -# (cd tests && touch $(DEP) && $(MAKE) dependencies) + (cd tests && touch $(DEP) && $(MAKE) dependencies) diff --git a/dcmfg/include/dcmtk/dcmfg/fginterface.h b/dcmfg/include/dcmtk/dcmfg/fginterface.h index 294e93fb..bd9c6cc5 100644 --- a/dcmfg/include/dcmtk/dcmfg/fginterface.h +++ b/dcmfg/include/dcmtk/dcmfg/fginterface.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, Open Connections GmbH + * Copyright (C) 2015-2019, Open Connections GmbH * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -192,6 +192,25 @@ public: */ size_t deleteFrame(const Uint32 frameNo); + /** If enabled, functional group structure is checked before actual writing + * is performed in the write() method. Checking might be time consuming + * on functional groups with many frames, though disabling might result in + * invalid functional group structures. Disabling should only be done if the + * user knows that the functional groups are valid, wants to to adapt the + * functional groups manually after calling write() or knows what he's doing + * otherwise.
+ * Per default, checking is enabled. + * @param doCheck If OFTrue, checking will be performed. If OFFalse, + * no checks are performed. + */ + virtual void setCheckOnWrite(const OFBool doCheck); + + /** Returns whether functional group structure is checked before actual + * writing is performed in the write() method. + * @return OFTrue if checking is performed, OFFalse otherwise + */ + virtual OFBool getCheckOnWrite(); + protected: /** Get shared functional group based on its type @@ -289,6 +308,10 @@ private: /// Link from frame number (map key) to the list of functional groups (value) /// relevant for the frame PerFrameGroups m_perFrame; + + /// If enabled, functional group structure is checked on write(). Otherwise, + /// checks are skipped. + OFBool m_checkOnWrite; }; #endif // MODMULTIFRAMEFGH_H diff --git a/dcmfg/libsrc/Makefile.dep b/dcmfg/libsrc/Makefile.dep index d4984adf..78a385a7 100644 --- a/dcmfg/libsrc/Makefile.dep +++ b/dcmfg/libsrc/Makefile.dep @@ -33,27 +33,22 @@ fg.o: fg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -108,11 +103,14 @@ fg.o: fg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fgbase.h fgbase.o: fgbase.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -157,15 +155,10 @@ fgbase.o: fgbase.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -226,11 +219,14 @@ fgbase.o: fgbase.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h \ ../../dcmiod/include/dcmtk/dcmiod/iodcommn.h \ @@ -293,15 +289,10 @@ fgderimg.o: fgderimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -364,11 +355,14 @@ fgderimg.o: fgderimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \ @@ -421,22 +415,17 @@ fgfact.o: fgfact.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -495,11 +484,14 @@ fgfact.o: fgfact.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fgderimg.h \ ../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \ @@ -561,21 +553,16 @@ fgfracon.o: fgfracon.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -633,11 +620,14 @@ fgfracon.o: fgfracon.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgbase.h ../include/dcmtk/dcmfg/fgtypes.h \ ../include/dcmtk/dcmfg/fgdefine.h @@ -685,15 +675,10 @@ fgframeanatomy.o: fgframeanatomy.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -754,11 +739,14 @@ fgframeanatomy.o: fgframeanatomy.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \ @@ -815,21 +803,16 @@ fgframevoilut.o: fgframevoilut.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -888,11 +871,14 @@ fgframevoilut.o: fgframevoilut.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h fgimagedatatype.o: fgimagedatatype.cc \ @@ -941,21 +927,16 @@ fgimagedatatype.o: fgimagedatatype.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -1014,11 +995,14 @@ fgimagedatatype.o: fgimagedatatype.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h fginterface.o: fginterface.cc \ @@ -1067,21 +1051,16 @@ fginterface.o: fginterface.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -1139,11 +1118,14 @@ fginterface.o: fginterface.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgtypes.h ../include/dcmtk/dcmfg/fgdefine.h \ ../include/dcmtk/dcmfg/fg.h ../include/dcmtk/dcmfg/fgbase.h \ @@ -1194,21 +1176,16 @@ fgparametricmapframetype.o: fgparametricmapframetype.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -1267,11 +1244,14 @@ fgparametricmapframetype.o: fgparametricmapframetype.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h fgpixeltransform.o: fgpixeltransform.cc \ @@ -1320,21 +1300,16 @@ fgpixeltransform.o: fgpixeltransform.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -1393,11 +1368,14 @@ fgpixeltransform.o: fgpixeltransform.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h fgpixmsr.o: fgpixmsr.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1443,15 +1421,10 @@ fgpixmsr.o: fgpixmsr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1512,11 +1485,14 @@ fgpixmsr.o: fgpixmsr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h \ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \ @@ -1568,15 +1544,10 @@ fgplanor.o: fgplanor.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1637,11 +1608,14 @@ fgplanor.o: fgplanor.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fgfact.h \ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \ @@ -1694,17 +1668,6 @@ fgplanorvol.o: fgplanorvol.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1712,6 +1675,12 @@ fgplanorvol.o: fgplanorvol.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -1770,10 +1739,13 @@ fgplanorvol.o: fgplanorvol.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h fgplanpo.o: fgplanpo.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1819,15 +1791,10 @@ fgplanpo.o: fgplanpo.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1888,11 +1855,14 @@ fgplanpo.o: fgplanpo.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fgfact.h \ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \ @@ -1947,21 +1917,16 @@ fgplanposvol.o: fgplanposvol.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -2020,11 +1985,14 @@ fgplanposvol.o: fgplanposvol.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h fgrealworldvaluemapping.o: fgrealworldvaluemapping.cc \ @@ -2071,15 +2039,10 @@ fgrealworldvaluemapping.o: fgrealworldvaluemapping.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2140,11 +2103,14 @@ fgrealworldvaluemapping.o: fgrealworldvaluemapping.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h \ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \ @@ -2199,15 +2165,10 @@ fgseg.o: fgseg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2268,11 +2229,14 @@ fgseg.o: fgseg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h \ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \ @@ -2314,28 +2278,23 @@ fgtypes.o: fgtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2391,11 +2350,14 @@ fgtypes.o: fgtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fgbase.h \ ../../dcmiod/include/dcmtk/dcmiod/iodcommn.h \ @@ -2462,21 +2424,16 @@ fgusimagedescription.o: fgusimagedescription.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -2535,11 +2492,14 @@ fgusimagedescription.o: fgusimagedescription.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fgbase.h stack.o: stack.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2601,22 +2561,17 @@ stackinterface.o: stackinterface.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -2675,11 +2630,14 @@ stackinterface.o: stackinterface.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmfg/fginterface.h ../include/dcmtk/dcmfg/fgtypes.h \ ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fg.h \ diff --git a/dcmfg/libsrc/fgderimg.cc b/dcmfg/libsrc/fgderimg.cc index 5ee6fa65..d6874474 100644 --- a/dcmfg/libsrc/fgderimg.cc +++ b/dcmfg/libsrc/fgderimg.cc @@ -129,16 +129,6 @@ int FGDerivationImage::compare(const FGBase& rhs) const size_t thisSize = m_DerivationImageItems.size(); size_t rhsSize = myRhs->m_DerivationImageItems.size(); - size_t maxSize = (thisSize > rhsSize) ? thisSize : rhsSize; - for (size_t count = 0; count < maxSize; count++) - { - int error = (*(m_DerivationImageItems[count])).compare( (*(myRhs->m_DerivationImageItems[count])) ); - if (error != 0) - { - return error; - } - } - if (thisSize < rhsSize) { return 1; @@ -148,6 +138,15 @@ int FGDerivationImage::compare(const FGBase& rhs) const return -1; } + for (size_t count = 0; count < thisSize; count++) + { + int error = (*(m_DerivationImageItems[count])).compare( (*(myRhs->m_DerivationImageItems[count])) ); + if (error != 0) + { + return error; + } + } + return 0; } diff --git a/dcmfg/libsrc/fginterface.cc b/dcmfg/libsrc/fginterface.cc index be144cf5..03b17c78 100644 --- a/dcmfg/libsrc/fginterface.cc +++ b/dcmfg/libsrc/fginterface.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, Open Connections GmbH + * Copyright (C) 2015-2019, Open Connections GmbH * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -30,7 +30,8 @@ FGInterface::FGInterface() : m_shared(), -m_perFrame() +m_perFrame(), +m_checkOnWrite(OFTrue) { } @@ -339,13 +340,15 @@ OFCondition FGInterface::readSingleFG(DcmItem& fgItem, } - // Write enhanced multi-frame information to DICOM item, usually DcmDataset OFCondition FGInterface::write(DcmItem& dataset) { //Check data integrity of functional group macros */ - if ( !check() ) - return FG_EC_CouldNotWriteFG; + if (m_checkOnWrite) + { + if ( !check() ) + return FG_EC_CouldNotWriteFG; + } // Write shared functional Groups OFCondition result = writeSharedFG(dataset); @@ -455,6 +458,18 @@ size_t FGInterface::deleteFrame(const Uint32 frameNo) } +void FGInterface::setCheckOnWrite(const OFBool doCheck) +{ + m_checkOnWrite = doCheck; +} + + +OFBool FGInterface::getCheckOnWrite() +{ + return m_checkOnWrite; +} + + FunctionalGroups* FGInterface::getOrCreatePerFrameGroups(const Uint32 frameNo) { OFMap::iterator it = m_perFrame.find(frameNo); diff --git a/dcmfg/tests/CMakeLists.txt b/dcmfg/tests/CMakeLists.txt new file mode 100644 index 00000000..7407bd0b --- /dev/null +++ b/dcmfg/tests/CMakeLists.txt @@ -0,0 +1,8 @@ +# declare executables +DCMTK_ADD_EXECUTABLE(dcmfg_tests tests t_deriv_image.cc t_frame_content.cc) + +# make sure executables are linked to the corresponding libraries +DCMTK_TARGET_LINK_MODULES(dcmfg_tests dcmfg dcmdata oflog ofstd) + +# This macro parses tests.cc and registers all tests +DCMTK_ADD_TESTS(dcmfg) diff --git a/dcmfg/tests/Makefile.dep b/dcmfg/tests/Makefile.dep new file mode 100644 index 00000000..8dcc7db6 --- /dev/null +++ b/dcmfg/tests/Makefile.dep @@ -0,0 +1,307 @@ +t_deriv_image.o: t_deriv_image.cc \ + ../../config/include/dcmtk/config/osconfig.h \ + ../include/dcmtk/dcmfg/fgderimg.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \ + ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \ + ../../ofstd/include/dcmtk/ofstd/ofmap.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \ + ../../ofstd/include/dcmtk/ofstd/ofdate.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \ + ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ + ../../ofstd/include/dcmtk/ofstd/oftime.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ + ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \ + ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \ + ../../dcmiod/include/dcmtk/dcmiod/ioddef.h \ + ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \ + ../../dcmiod/include/dcmtk/dcmiod/modbase.h \ + ../include/dcmtk/dcmfg/fgbase.h ../include/dcmtk/dcmfg/fgtypes.h \ + ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fginterface.h \ + ../include/dcmtk/dcmfg/fg.h ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h +t_frame_content.o: t_frame_content.cc \ + ../../config/include/dcmtk/config/osconfig.h \ + ../include/dcmtk/dcmfg/fgfracon.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \ + ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \ + ../../ofstd/include/dcmtk/ofstd/ofmap.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \ + ../../ofstd/include/dcmtk/ofstd/ofdate.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \ + ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ + ../../ofstd/include/dcmtk/ofstd/oftime.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ + ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../include/dcmtk/dcmfg/fgbase.h ../include/dcmtk/dcmfg/fgtypes.h \ + ../include/dcmtk/dcmfg/fgdefine.h ../include/dcmtk/dcmfg/fginterface.h \ + ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \ + ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \ + ../../dcmiod/include/dcmtk/dcmiod/ioddef.h \ + ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \ + ../include/dcmtk/dcmfg/fg.h ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h +tests.o: tests.cc ../../config/include/dcmtk/config/osconfig.h \ + ../../ofstd/include/dcmtk/ofstd/oftest.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h diff --git a/dcmfg/tests/Makefile.in b/dcmfg/tests/Makefile.in index 428f5757..4f6c0763 100644 --- a/dcmfg/tests/Makefile.in +++ b/dcmfg/tests/Makefile.in @@ -5,25 +5,54 @@ @SET_MAKE@ SHELL = /bin/sh +VPATH = @srcdir@:@top_srcdir@/include:@top_srcdir@/@configdir@/include srcdir = @srcdir@ top_srcdir = @top_srcdir@ configdir = @top_srcdir@/@configdir@ include $(configdir)/@common_makefile@ +ofstddir = $(top_srcdir)/../ofstd +oflogdir = $(top_srcdir)/../oflog +dcmdatadir = $(top_srcdir)/../dcmdata +dcmioddir = $(top_srcdir)/../dcmiod -all: +LIBDIRS = -L$(top_srcdir)/libsrc -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc \ + -L$(dcmdatadir)/libsrc -L$(dcmioddir)/libsrc +LOCALLIBS = -ldcmfg -ldcmiod -ldcmdata -loflog -lofstd $(ZLIBLIBS) \ + $(CHARCONVLIBS) $(MATHLIBS) +LOCALINCLUDES = -I$(top_srcdir)/include -I$(ofstddir)/include -I$(oflogdir)/include \ + -I$(dcmdatadir)/include -I$(dcmioddir)/include \ -check: +test_objs = tests.o t_deriv_image.o t_frame_content.o +objs = $(test_objs) +progs = tests -check-exhaustive: -install: +all: $(progs) + +tests: $(test_objs) + $(CXX) $(CXXFLAGS) $(LIBDIRS) $(LDFLAGS) -o $@ $(test_objs) $(LOCALLIBS) $(LIBS) + + +check: tests + ./tests + +check-exhaustive: tests + ./tests -x + + +install: all + clean: - rm -f $(TRASH) + rm -f $(objs) $(progs) $(LOCALTRASH) $(TRASH) distclean: - rm -f $(DISTTRASH) + rm -f $(objs) $(progs) $(LOCALTRASH) $(DISTTRASH) + dependencies: + $(CXX) -MM $(defines) $(includes) $(CPPFLAGS) $(CXXFLAGS) *.cc > $(DEP) + +include $(DEP) diff --git a/dcmfg/tests/t_deriv_image.cc b/dcmfg/tests/t_deriv_image.cc new file mode 100644 index 00000000..f3147502 --- /dev/null +++ b/dcmfg/tests/t_deriv_image.cc @@ -0,0 +1,164 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmfg + * + * Author: Michael Onken + * + * Purpose: Tests for Derivation Image FG class + * + */ + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmfg/fgderimg.h" +#include "dcmtk/dcmfg/fginterface.h" +#include "dcmtk/ofstd/oftest.h" + +static void init_template(OFString& fg_dump) +{ + fg_dump = "(fffe,e000) na (Item with explicit length #=1) # 0, 1 Item\n"; + fg_dump += "(0008,9124) SQ (Sequence with explicit length #=1) # 0, 1 DerivationImageSequence\n"; + fg_dump += " (fffe,e000) na (Item with explicit length #=3) # 0, 1 Item\n"; + fg_dump += " (0008,2111) ST [Some Description] # 16, 1 DerivationDescription\n"; + fg_dump += " (0008,2112) SQ (Sequence with explicit length #=1) # 0, 1 SourceImageSequence\n"; + fg_dump += " (fffe,e000) na (Item with explicit length #=5) # 0, 1 Item\n"; + fg_dump += " (0008,1150) UI =CTImageStorage # 26, 1 ReferencedSOPClassUID\n"; + fg_dump += " (0008,1155) UI [1.2.3.4] # 8, 1 ReferencedSOPInstanceUID\n"; + fg_dump += " (0008,1160) IS [1\\2] # 4, 2 ReferencedFrameNumber\n"; + fg_dump + += " (0040,a170) SQ (Sequence with explicit length #=1) # 0, 1 PurposeOfReferenceCodeSequence\n"; + fg_dump += " (fffe,e000) na (Item with explicit length #=3) # 0, 1 Item\n"; + fg_dump += " (0008,0100) SH [PURPOSE CODE] # 12, 1 CodeValue\n"; + fg_dump += " (0008,0102) SH [99DCMFG] # 8, 1 CodingSchemeDesignator\n"; + fg_dump += " (0008,0104) LO [Code Meaning Purpose] # 20, 1 CodeMeaning\n"; + fg_dump += " (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem\n"; + fg_dump += " (fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem\n"; + fg_dump += " (0062,000b) US 3\\4 # 4, 2 ReferencedSegmentNumber\n"; + fg_dump += " (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem\n"; + fg_dump += " (fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem\n"; + fg_dump += " (0008,9215) SQ (Sequence with explicit length #=1) # 0, 1 DerivationCodeSequence\n"; + fg_dump += " (fffe,e000) na (Item with explicit length #=3) # 0, 1 Item\n"; + fg_dump += " (0008,0100) SH [CODE_VALUE] # 10, 1 CodeValue\n"; + fg_dump += " (0008,0102) SH [99DCMFG] # 8, 1 CodingSchemeDesignator\n"; + fg_dump += " (0008,0104) LO [Code Meaning Derivation Description] # 36, 1 CodeMeaning\n"; + fg_dump += " (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem\n"; + fg_dump += " (fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem\n"; + fg_dump += " (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem\n"; + fg_dump += "(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem\n"; + fg_dump += "(fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem\n"; +} + +static void check_deriv_image_fg(FGDerivationImage& fg) +{ + OFVector deriv_img_items = fg.getDerivationImageItems(); + OFCHECK(deriv_img_items.size() == 1); + if (deriv_img_items.size() == 0) return; + OFVector& deriv_code_items = deriv_img_items[0]->getDerivationCodeItems(); + OFCHECK(deriv_code_items.size() == 1); + if (deriv_code_items.size() == 0) return; + CodeSequenceMacro* code_item = deriv_code_items[0]; + OFString str; + code_item->getCodeValue(str); + OFCHECK(str == "CODE_VALUE"); + code_item->getCodingSchemeDesignator(str); + OFCHECK(str == "99DCMFG"); + code_item->getCodeMeaning(str); + OFCHECK(str == "Code Meaning Derivation Description"); + + DerivationImageItem* deriv_item = deriv_img_items[0]; + OFCHECK(deriv_item->getSourceImageItems().size() == 1); + OFVector numbers; + deriv_item->getSourceImageItems()[0]->getImageSOPInstanceReference().getReferencedFrameNumber(numbers); + OFCHECK(numbers.size() == 2); + OFCHECK(numbers[0] == 1); + OFCHECK(numbers[1] == 2); + numbers.clear(); + deriv_item->getSourceImageItems()[0]->getImageSOPInstanceReference().getReferencedSegmentNumber(numbers); + OFCHECK(numbers.size() == 2); + OFCHECK(numbers[0] == 3); + OFCHECK(numbers[1] == 4); + deriv_item->getSourceImageItems()[0]->getImageSOPInstanceReference().getReferencedSOPClassUID(str); + OFCHECK(str == UID_CTImageStorage); + deriv_item->getSourceImageItems()[0]->getImageSOPInstanceReference().getReferencedSOPInstanceUID(str); + OFCHECK(str == "1.2.3.4"); + CodeSequenceMacro& code = deriv_item->getSourceImageItems()[0]->getPurposeOfReferenceCode(); + code.getCodeValue(str); + OFCHECK(str == "PURPOSE CODE"); + code.getCodingSchemeDesignator(str); + OFCHECK(str == "99DCMFG"); + code.getCodeMeaning(str); + OFCHECK(str == "Code Meaning Purpose"); +} + +OFTEST(dcmfg_derivation_image) +{ + OFString fg_dump; + init_template(fg_dump); + + FGDerivationImage fg; + CodeSequenceMacro deriv_code("CODE_VALUE", "99DCMFG", "Code Meaning Derivation Description"); + DerivationImageItem* deriv_item = NULL; + OFCondition result = fg.addDerivationImageItem(deriv_code, "Some Description", deriv_item); + OFCHECK(result.good()); + OFCHECK(deriv_item != NULL); + if (result.bad() || !deriv_item) return; + + SourceImageItem* src_image_item = new SourceImageItem(); + OFCHECK(src_image_item != NULL); + if (!deriv_item) return; + OFCHECK(src_image_item->getImageSOPInstanceReference().addReferencedFrameNumber(1).good()); + OFCHECK(src_image_item->getImageSOPInstanceReference().addReferencedFrameNumber(2).good()); + OFCHECK(src_image_item->getImageSOPInstanceReference().addReferencedSegmentNumber(3).good()); + OFCHECK(src_image_item->getImageSOPInstanceReference().addReferencedSegmentNumber(4).good()); + OFCHECK(src_image_item->getImageSOPInstanceReference().setReferencedSOPInstanceUID("1.2.3.4").good()); + OFCHECK(src_image_item->getImageSOPInstanceReference().setReferencedSOPClassUID(UID_CTImageStorage).good()); + OFCHECK(src_image_item->getPurposeOfReferenceCode().set("PURPOSE CODE", "99DCMFG", "Code Meaning Purpose").good()); + + OFVector& src_image_items = deriv_item->getSourceImageItems(); + src_image_items.push_back(src_image_item); + + // Check data structure in memory + check_deriv_image_fg(fg); + + // Write to DcmItem and compare with pre-defined template + DcmItem dest_item; + result = fg.write(dest_item); + OFCHECK(result.good()); + OFStringStream out; + dest_item.print(out); + OFCHECK(out.str() == fg_dump.c_str()); + + // Test read method: Read from dataset, write again, and compare another time + FGDerivationImage fg_for_read; + out.str(""); // set to empty + fg_for_read.read(dest_item); + dest_item.clear(); + result = fg_for_read.write(dest_item); + OFCHECK(result.good()); + if (result.bad()) return; + dest_item.print(out); + OFCHECK(out.str() == fg_dump.c_str()); + + // Test compare() method + OFCHECK(fg.compare(fg_for_read) == 0); + fg_for_read.getDerivationImageItems()[0]->setDerivationDescription("Another Description"); + OFCHECK(fg.compare(fg_for_read) != 0); + + // Test clone() method + FGDerivationImage* clone = OFstatic_cast(FGDerivationImage*, fg.clone()); + OFCHECK(clone != NULL); + if (clone == NULL) return; + OFCHECK(clone->compare(fg) == 0); + delete clone; +} diff --git a/dcmfg/tests/t_frame_content.cc b/dcmfg/tests/t_frame_content.cc new file mode 100644 index 00000000..ebd87093 --- /dev/null +++ b/dcmfg/tests/t_frame_content.cc @@ -0,0 +1,137 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmfg + * + * Author: Michael Onken + * + * Purpose: Tests for Frame Content FG class + * + */ + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmfg/fgfracon.h" +#include "dcmtk/dcmfg/fginterface.h" +#include "dcmtk/ofstd/ofcond.h" +#include "dcmtk/ofstd/oftest.h" + +static void init_template(OFString& fg_dump) +{ + fg_dump += "(fffe,e000) na (Item with explicit length #=1) # 0, 1 Item\n"; + fg_dump += "(0020,9111) SQ (Sequence with explicit length #=1) # 0, 1 FrameContentSequence\n"; + fg_dump += " (fffe,e000) na (Item with explicit length #=12) # 0, 1 Item\n"; + fg_dump += " (0018,9074) DT [20190508214701] # 14, 1 FrameAcquisitionDateTime\n"; + fg_dump += " (0018,9151) DT [20190508214701] # 14, 1 FrameReferenceDateTime\n"; + fg_dump += " (0018,9214) CS [START_RESPIR] # 12, 1 RespiratoryCyclePosition\n"; + fg_dump += " (0018,9220) FD 500.5 # 8, 1 FrameAcquisitionDuration\n"; + fg_dump += " (0018,9236) CS [END_SYSTOLE] # 12, 1 CardiacCyclePosition\n"; + fg_dump += " (0020,9056) SH [1] # 2, 1 StackID\n"; + fg_dump += " (0020,9057) UL 3 # 4, 1 InStackPositionNumber\n"; + fg_dump += " (0020,9128) UL 4 # 4, 1 TemporalPositionIndex\n"; + fg_dump += " (0020,9156) US 2 # 2, 1 FrameAcquisitionNumber\n"; + fg_dump += " (0020,9157) UL 1 # 4, 1 DimensionIndexValues\n"; + fg_dump += " (0020,9158) LT [Comments] # 8, 1 FrameComments\n"; + fg_dump += " (0020,9453) LO [LABEL] # 6, 1 FrameLabel\n"; + fg_dump += " (fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem\n"; + fg_dump += "(fffe,e0dd) na (SequenceDelimitationItem for re-encod.) # 0, 0 SequenceDelimitationItem\n"; + fg_dump += "(fffe,e00d) na (ItemDelimitationItem for re-encoding) # 0, 0 ItemDelimitationItem\n"; +} + +static void check_frame_content_fg(FGFrameContent& fg) +{ + OFCondition result; + OFString val; + OFCHECK(fg.getCardiacCyclePosition(val).good()); + OFCHECK(val == "END_SYSTOLE"); + Uint32 uint32 = 0; + OFCHECK(fg.getDimensionIndexValues(uint32).good()); + OFCHECK(uint32 == 1); + OFCHECK(fg.getFrameAcquisitionDateTime(val).good()); + OFCHECK(val == "20190508214701"); + Float64 float64 = 0.0; + OFCHECK(fg.getFrameAcquisitionDuration(float64).good()); + OFCHECK(float64 == 500.50); + Uint16 uint16 = 0; + fg.getFrameAcquisitionNumber(uint16); + OFCHECK(fg.getFrameAcquisitionNumber(uint16).good()); + OFCHECK(uint16 == 2); + OFCHECK(fg.getFrameComments(val).good()); + OFCHECK(val == "Comments"); + OFCHECK(fg.getFrameLabel(val).good()); + OFCHECK(val == "LABEL"); + OFCHECK(fg.getFrameReferenceDateTime(val).good()); + OFCHECK(val == "20190508214701"); + OFCHECK(fg.getInStackPositionNumber(uint32).good()); + OFCHECK(uint32 == 3); + OFCHECK(fg.getRespiratoryCyclePosition(val).good()); + OFCHECK(val == "START_RESPIR"); + OFCHECK(fg.getStackID(val).good()); + OFCHECK(val == "1"); + OFCHECK(fg.getTemporalPositionIndex(uint32).good()); + OFCHECK(uint32 == 4); +} + +OFTEST(dcmfg_frame_content) +{ + OFString fg_dump; + init_template(fg_dump); + + FGFrameContent fg; + OFCHECK(fg.setCardiacCyclePosition("END_SYSTOLE").good()); + OFCHECK(fg.setDimensionIndexValues(1, 0).good()); + OFCHECK(fg.setFrameAcquisitionDateTime("20190508214701").good()); + OFCHECK(fg.setFrameAcquisitionDuration(500.50).good()); + OFCHECK(fg.setFrameAcquisitionNumber(2).good()); + OFCHECK(fg.setFrameComments("Comments").good()); + OFCHECK(fg.setFrameLabel("LABEL").good()); + OFCHECK(fg.setFrameReferenceDateTime("20190508214701").good()); + OFCHECK(fg.setInStackPositionNumber(3).good()); + OFCHECK(fg.setRespiratoryCyclePosition("START_RESPIR").good()); + OFCHECK(fg.setStackID("1").good()); + OFCHECK(fg.setTemporalPositionIndex(4).good()); + + // Check data structure in memory + check_frame_content_fg(fg); + + // Write to DcmItem and compare with pre-defined template + DcmItem dest_item; + OFCondition result = fg.write(dest_item); + OFCHECK(result.good()); + OFStringStream out; + dest_item.print(out); + OFCHECK(out.str() == fg_dump.c_str()); /**/ + + // Test read method: Read from dataset, write again, and compare another time + FGFrameContent fg_for_read; + out.str(""); // set to empty + fg_for_read.read(dest_item); + dest_item.clear(); + result = fg_for_read.write(dest_item); + OFCHECK(result.good()); + if (result.bad()) return; + dest_item.print(out); + OFCHECK(out.str() == fg_dump.c_str()); + + // Test compare() method + OFCHECK(fg.compare(fg_for_read) == 0); + fg_for_read.setFrameComments("Another Comment"); + OFCHECK(fg.compare(fg_for_read) != 0); + + // Test clone() method + FGFrameContent* clone = OFstatic_cast(FGFrameContent*, fg.clone()); + OFCHECK(clone != NULL); + if (clone == NULL) return; + OFCHECK(clone->compare(fg) == 0); + delete clone; +} diff --git a/dcmfg/tests/tests.cc b/dcmfg/tests/tests.cc new file mode 100644 index 00000000..af66e545 --- /dev/null +++ b/dcmfg/tests/tests.cc @@ -0,0 +1,27 @@ +/* + * + * Copyright (C) 2015, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmfg + * + * Author: Michael Onken + * + * Purpose: main test program + * + */ + +#include "dcmtk/config/osconfig.h" +#include "dcmtk/ofstd/oftest.h" + +OFTEST_REGISTER(dcmfg_derivation_image); +OFTEST_REGISTER(dcmfg_frame_content); +OFTEST_MAIN("dcmfg") diff --git a/dcmimage/apps/Makefile.dep b/dcmimage/apps/Makefile.dep index 3b05c53f..8a68266d 100644 --- a/dcmimage/apps/Makefile.dep +++ b/dcmimage/apps/Makefile.dep @@ -33,26 +33,21 @@ dcm2pnm.o: dcm2pnm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -108,11 +103,14 @@ dcm2pnm.o: dcm2pnm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmdata/include/dcmtk/dcmdata/dcrledrg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \ @@ -136,6 +134,11 @@ dcm2pnm.o: dcm2pnm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diciefn.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dicielut.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didislut.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimage/diregist.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h \ ../include/dcmtk/dcmimage/dicdefin.h \ @@ -178,20 +181,18 @@ dcmicmp.o: dcmicmp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -256,12 +257,17 @@ dcmicmp.o: dcmicmp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimage/diregist.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h dcmquant.o: dcmquant.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -299,26 +305,21 @@ dcmquant.o: dcmquant.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -374,11 +375,14 @@ dcmquant.o: dcmquant.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoimg.h \ @@ -397,6 +401,11 @@ dcmquant.o: dcmquant.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dibaslut.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoopx.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didispfn.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimage/diregist.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h \ ../include/dcmtk/dcmimage/dicdefin.h ../include/dcmtk/dcmimage/diquant.h \ @@ -437,26 +446,21 @@ dcmscale.o: dcmscale.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -512,12 +516,20 @@ dcmscale.o: dcmscale.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoimg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ diff --git a/dcmimage/apps/dcm2pnm.cc b/dcmimage/apps/dcm2pnm.cc index b800a3f1..4fa8482c 100644 --- a/dcmimage/apps/dcm2pnm.cc +++ b/dcmimage/apps/dcm2pnm.cc @@ -164,11 +164,7 @@ int main(int argc, char *argv[]) #ifdef WITH_LIBTIFF // TIFF parameters -#ifdef HAVE_LIBTIFF_LZW_COMPRESSION DiTIFFCompression opt_tiffCompression = E_tiffLZWCompression; -#else - DiTIFFCompression opt_tiffCompression = E_tiffPackBitsCompression; -#endif DiTIFFLZWPredictor opt_lzwPredictor = E_tiffLZWPredictorDefault; OFCmdUnsignedInt opt_rowsPerStrip = 0; #endif @@ -347,17 +343,12 @@ int main(int argc, char *argv[]) #ifdef WITH_LIBTIFF cmd.addSubGroup("TIFF format:"); -#ifdef HAVE_LIBTIFF_LZW_COMPRESSION cmd.addOption("--compr-lzw", "+Tl", "LZW compression (default)"); cmd.addOption("--compr-rle", "+Tr", "RLE compression"); cmd.addOption("--compr-none", "+Tn", "uncompressed"); cmd.addOption("--predictor-default", "+Pd", "no LZW predictor (default)"); cmd.addOption("--predictor-none", "+Pn", "LZW predictor 1 (no prediction)"); cmd.addOption("--predictor-horz", "+Ph", "LZW predictor 2 (horizontal differencing)"); -#else - cmd.addOption("--compr-rle", "+Tr", "RLE compression (default)"); - cmd.addOption("--compr-none", "+Tn", "uncompressed"); -#endif cmd.addOption("--rows-per-strip", "+Rs", 1, "[r]ows: integer (default: 0)", "rows per strip, default 8K per strip"); #endif @@ -441,11 +432,6 @@ int main(int argc, char *argv[]) #endif #ifdef WITH_LIBTIFF COUT << "- " << DiTIFFPlugin::getLibraryVersionString() << OFendl; -#ifdef HAVE_LIBTIFF_LZW_COMPRESSION - COUT << " with LZW compression support" << OFendl; -#else - COUT << " without LZW compression support" << OFendl; -#endif #endif #ifdef WITH_LIBPNG COUT << "- " << DiPNGPlugin::getLibraryVersionString() << OFendl; @@ -783,20 +769,16 @@ int main(int argc, char *argv[]) #ifdef WITH_LIBTIFF cmd.beginOptionBlock(); -#ifdef HAVE_LIBTIFF_LZW_COMPRESSION if (cmd.findOption("--compr-lzw")) opt_tiffCompression = E_tiffLZWCompression; -#endif if (cmd.findOption("--compr-rle")) opt_tiffCompression = E_tiffPackBitsCompression; if (cmd.findOption("--compr-none")) opt_tiffCompression = E_tiffNoCompression; cmd.endOptionBlock(); -#ifdef HAVE_LIBTIFF_LZW_COMPRESSION cmd.beginOptionBlock(); if (cmd.findOption("--predictor-default")) opt_lzwPredictor = E_tiffLZWPredictorDefault; if (cmd.findOption("--predictor-none")) opt_lzwPredictor = E_tiffLZWPredictorNoPrediction; if (cmd.findOption("--predictor-horz")) opt_lzwPredictor = E_tiffLZWPredictorHDifferencing; cmd.endOptionBlock(); -#endif if (cmd.findOption("--rows-per-strip")) app.checkValue(cmd.getValueAndCheckMinMax(opt_rowsPerStrip, 0, 65535)); diff --git a/dcmimage/include/dcmtk/dcmimage/dcmicmph.h b/dcmimage/include/dcmtk/dcmimage/dcmicmph.h index c902625a..9c147a7c 100644 --- a/dcmimage/include/dcmtk/dcmimage/dcmicmph.h +++ b/dcmimage/include/dcmtk/dcmimage/dcmicmph.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2018, OFFIS e.V. + * Copyright (C) 2018-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -27,6 +27,7 @@ #include "dcmtk/dcmimage/dicdefin.h" /* for export macros */ #include "dcmtk/dcmimgle/diutils.h" /* for EW_WindowType */ #include "dcmtk/ofstd/ofstd.h" /* for OFCondition */ +#include "dcmtk/ofstd/ofcmdln.h" /* for OFCmdUnsignedInt */ #include "dcmtk/dcmdata/dcxfer.h" /* for E_TransferSyntax */ class DicomImage; diff --git a/dcmimage/libsrc/Makefile.dep b/dcmimage/libsrc/Makefile.dep index 6a287c57..b8334ccf 100644 --- a/dcmimage/libsrc/Makefile.dep +++ b/dcmimage/libsrc/Makefile.dep @@ -34,25 +34,25 @@ dcmicmph.o: dcmicmph.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ @@ -112,11 +112,14 @@ dcmicmph.o: dcmicmph.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoimg.h \ @@ -170,27 +173,22 @@ diargimg.o: diargimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmimage/diargimg.h ../include/dcmtk/dcmimage/dicoimg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -255,25 +253,20 @@ dicmyimg.o: dicmyimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimage/dicmyimg.h ../include/dcmtk/dcmimage/dicoimg.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimage/dicmyimg.h ../include/dcmtk/dcmimage/dicoimg.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -331,19 +324,6 @@ dicoimg.o: dicoimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -353,14 +333,22 @@ dicoimg.o: dicoimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmimage/dicoimg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfcache.h \ @@ -428,19 +416,6 @@ dicoopx.o: dicoopx.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmimage/dicdefin.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dipixel.h @@ -478,19 +453,6 @@ dicopx.o: dicopx.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -505,10 +467,18 @@ dicopx.o: dicopx.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diluptab.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dibaslut.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diobjcou.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diinpx.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didocu.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ @@ -555,25 +525,20 @@ dihsvimg.o: dihsvimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimage/dihsvimg.h ../include/dcmtk/dcmimage/dicoimg.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimage/dihsvimg.h ../include/dcmtk/dcmimage/dicoimg.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -631,19 +596,6 @@ dilogger.o: dilogger.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimage/dicdefin.h dipalimg.o: dipalimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ @@ -679,28 +631,23 @@ dipalimg.o: dipalimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didocu.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ @@ -764,24 +711,19 @@ dipipng.o: dipipng.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -836,24 +778,19 @@ dipitiff.o: dipitiff.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -924,21 +861,16 @@ diqtctab.o: diqtctab.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ @@ -1007,25 +939,20 @@ diqthash.o: diqthash.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoimg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -1104,18 +1031,6 @@ diquant.o: diquant.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmimage/diqttype.h \ ../include/dcmtk/dcmimage/dicdefin.h ../include/dcmtk/dcmimage/diqtid.h \ @@ -1124,8 +1039,15 @@ diquant.o: diquant.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoimg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1199,28 +1121,23 @@ diregist.o: diregist.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ + ../include/dcmtk/dcmimage/dicdefin.h \ + ../include/dcmtk/dcmimage/dipalimg.h ../include/dcmtk/dcmimage/dicoimg.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ - ../include/dcmtk/dcmimage/dicdefin.h \ - ../include/dcmtk/dcmimage/dipalimg.h ../include/dcmtk/dcmimage/dicoimg.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1291,25 +1208,20 @@ dirgbimg.o: dirgbimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimage/dirgbimg.h ../include/dcmtk/dcmimage/dicoimg.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimage/dirgbimg.h ../include/dcmtk/dcmimage/dicoimg.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1367,25 +1279,20 @@ diybrimg.o: diybrimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimage/diybrimg.h ../include/dcmtk/dcmimage/dicoimg.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimage/diybrimg.h ../include/dcmtk/dcmimage/dicoimg.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1448,25 +1355,20 @@ diyf2img.o: diyf2img.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimage/diyf2img.h ../include/dcmtk/dcmimage/dicoimg.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimage/diyf2img.h ../include/dcmtk/dcmimage/dicoimg.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1529,25 +1431,20 @@ diyp2img.o: diyp2img.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimage/diyp2img.h ../include/dcmtk/dcmimage/dicoimg.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimage/diyp2img.h ../include/dcmtk/dcmimage/dicoimg.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ diff --git a/dcmimage/libsrc/dipipng.cc b/dcmimage/libsrc/dipipng.cc index 9488d9f1..162045d6 100644 --- a/dcmimage/libsrc/dipipng.cc +++ b/dcmimage/libsrc/dipipng.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2011, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -181,7 +181,7 @@ int DiPNGPlugin::write( png_write_end( png_ptr, info_ptr ); // finish - png_destroy_write_struct( &png_ptr, NULL ); + png_destroy_write_struct( &png_ptr, &info_ptr ); delete[] row_ptr; if( text_ptr ) delete[] text_ptr; result = 1; diff --git a/dcmimgle/apps/Makefile.dep b/dcmimgle/apps/Makefile.dep index a074718e..9386090b 100644 --- a/dcmimgle/apps/Makefile.dep +++ b/dcmimgle/apps/Makefile.dep @@ -33,26 +33,21 @@ dcmdspfn.o: dcmdspfn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -108,12 +103,20 @@ dcmdspfn.o: dcmdspfn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimgle/digsdfn.h ../include/dcmtk/dcmimgle/didispfn.h \ ../include/dcmtk/dcmimgle/didefine.h ../include/dcmtk/dcmimgle/diciefn.h \ ../include/dcmtk/dcmimgle/dicielut.h \ diff --git a/dcmimgle/apps/dcod2lum.cc b/dcmimgle/apps/dcod2lum.cc index 2b438e37..69d3d9ab 100644 --- a/dcmimgle/apps/dcod2lum.cc +++ b/dcmimgle/apps/dcod2lum.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2002-2010, OFFIS e.V. + * Copyright (C) 2002-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -45,11 +45,7 @@ int main(int argc, char *argv[]) /* check number of arguments */ if (argc == 3) { -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE ifstream input(argv[1], STD_NAMESPACE ios::in | STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE ifstream input(argv[1], STD_NAMESPACE ios::in); -#endif + STD_NAMESPACE ifstream input(argv[1], OFopenmode_in_nocreate); if (input) { STD_NAMESPACE ofstream output(argv[2]); diff --git a/dcmimgle/apps/dconvlum.cc b/dcmimgle/apps/dconvlum.cc index d0954c73..f15f3d7f 100644 --- a/dcmimgle/apps/dconvlum.cc +++ b/dcmimgle/apps/dconvlum.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1999-2010, OFFIS e.V. + * Copyright (C) 1999-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -43,11 +43,7 @@ int main(int argc, char *argv[]) /* check number of arguments */ if ((argc >= 3) && (argc <= 4)) { -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE ifstream input(argv[1], STD_NAMESPACE ios::in | STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE ifstream input(argv[1], STD_NAMESPACE ios::in); -#endif + STD_NAMESPACE ifstream input(argv[1], OFopenmode_in_nocreate); if (input) { STD_NAMESPACE ofstream output(argv[2]); diff --git a/dcmimgle/include/dcmtk/dcmimgle/dcmimage.h b/dcmimgle/include/dcmtk/dcmimgle/dcmimage.h index 6f776963..ab0cd15d 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dcmimage.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dcmimage.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2016, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -457,7 +457,7 @@ class DCMTK_DCMIMGLE_EXPORT DicomImage } /** render pixel data and return pointer to given plane (internal memory buffer). - * apply VOI/PLUT transformation and (visible) overlay planes + * apply VOI/PLUT transformation and (visible) overlay planes. * internal memory buffer will be delete for the next getBitmap/Output operation. * Supported output color models: Monochrome 2 for monochrome images and RGB * (or YCbCr_Full if flag CIF_KeepYCbCrColorModel is set) for color images. diff --git a/dcmimgle/libsrc/Makefile.dep b/dcmimgle/libsrc/Makefile.dep index bd48740c..579c54fb 100644 --- a/dcmimgle/libsrc/Makefile.dep +++ b/dcmimgle/libsrc/Makefile.dep @@ -32,25 +32,14 @@ dcmimage.o: dcmimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -58,9 +47,15 @@ dcmimage.o: dcmimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmimgle/dcmimage.h ../include/dcmtk/dcmimgle/dimoimg.h \ ../include/dcmtk/dcmimgle/diimage.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfcache.h \ @@ -117,19 +112,6 @@ dibaslut.o: dibaslut.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimgle/didefine.h diciefn.o: diciefn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmimgle/diciefn.h ../include/dcmtk/dcmimgle/didispfn.h \ @@ -169,20 +151,7 @@ diciefn.o: diciefn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/spi/logfact.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ - ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h + ../../oflog/include/dcmtk/oflog/tracelog.h dicielut.o: dicielut.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmimgle/dicielut.h \ ../include/dcmtk/dcmimgle/didislut.h \ @@ -220,19 +189,6 @@ dicielut.o: dicielut.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimgle/didefine.h didislut.o: didislut.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmimgle/didislut.h \ @@ -270,19 +226,6 @@ didislut.o: didislut.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimgle/didefine.h didispfn.o: didispfn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -324,20 +267,7 @@ didispfn.o: didispfn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/spi/logfact.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ - ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h + ../../oflog/include/dcmtk/oflog/tracelog.h didocu.o: didocu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ @@ -373,26 +303,21 @@ didocu.o: didocu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -448,11 +373,14 @@ didocu.o: didocu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmimgle/didocu.h ../include/dcmtk/dcmimgle/diobjcou.h \ ../include/dcmtk/dcmimgle/didefine.h ../include/dcmtk/dcmimgle/diutils.h @@ -495,20 +423,7 @@ digsdfn.o: digsdfn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/spi/logfact.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ - ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h + ../../oflog/include/dcmtk/oflog/tracelog.h digsdlut.o: digsdlut.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmimgle/digsdlut.h \ ../include/dcmtk/dcmimgle/didislut.h \ @@ -546,19 +461,6 @@ digsdlut.o: digsdlut.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmimgle/displint.h diimage.o: diimage.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -595,30 +497,25 @@ diimage.o: diimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmimgle/diimage.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ @@ -674,19 +571,6 @@ diinpx.o: diinpx.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimgle/didefine.h diluptab.o: diluptab.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ @@ -739,11 +623,6 @@ diluptab.o: diluptab.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ @@ -792,25 +671,20 @@ dimo1img.o: dimo1img.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimgle/dimo1img.h ../include/dcmtk/dcmimgle/dimoimg.h \ + ../include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimgle/dimo1img.h ../include/dcmtk/dcmimgle/dimoimg.h \ - ../include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -862,25 +736,20 @@ dimo2img.o: dimo2img.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimgle/dimo2img.h ../include/dcmtk/dcmimgle/dimoimg.h \ + ../include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimgle/dimo2img.h ../include/dcmtk/dcmimgle/dimoimg.h \ - ../include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -932,26 +801,21 @@ dimoimg.o: dimoimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ + ../include/dcmtk/dcmimgle/dimoimg.h ../include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmimgle/dimoimg.h ../include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1028,15 +892,10 @@ dimoimg3.o: dimoimg3.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1103,15 +962,10 @@ dimoimg4.o: dimoimg4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1178,15 +1032,10 @@ dimoimg5.o: dimoimg5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1248,24 +1097,20 @@ dimomod.o: dimomod.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmimgle/didefine.h \ + ../include/dcmtk/dcmimgle/diobjcou.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmimgle/didocu.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmimgle/didefine.h \ - ../include/dcmtk/dcmimgle/diobjcou.h ../include/dcmtk/dcmimgle/didocu.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ @@ -1313,26 +1158,14 @@ dimoopx.o: dimoopx.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimgle/didefine.h ../include/dcmtk/dcmimgle/dimopx.h \ ../include/dcmtk/dcmimgle/dipixel.h ../include/dcmtk/dcmimgle/dimomod.h \ ../include/dcmtk/dcmimgle/diluptab.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmimgle/dibaslut.h \ - ../include/dcmtk/dcmimgle/diobjcou.h + ../include/dcmtk/dcmimgle/diobjcou.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h dimopx.o: dimopx.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmimgle/dimopx.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ @@ -1368,26 +1201,14 @@ dimopx.o: dimopx.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmimgle/didefine.h ../include/dcmtk/dcmimgle/dimomod.h \ ../include/dcmtk/dcmimgle/diluptab.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmimgle/dibaslut.h \ - ../include/dcmtk/dcmimgle/diobjcou.h ../include/dcmtk/dcmimgle/diinpx.h \ - ../include/dcmtk/dcmimgle/dimoopx.h + ../include/dcmtk/dcmimgle/diobjcou.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmimgle/diinpx.h ../include/dcmtk/dcmimgle/dimoopx.h diovdat.o: diovdat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ @@ -1422,21 +1243,9 @@ diovdat.o: diovdat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmimgle/diovlay.h ../include/dcmtk/dcmimgle/diobjcou.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmimgle/didefine.h ../include/dcmtk/dcmimgle/diovdat.h \ ../include/dcmtk/dcmimgle/diovpln.h ../include/dcmtk/dcmimgle/diutils.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h @@ -1474,21 +1283,9 @@ diovlay.o: diovlay.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmimgle/diovlay.h ../include/dcmtk/dcmimgle/diobjcou.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmimgle/didefine.h ../include/dcmtk/dcmimgle/diovdat.h \ ../include/dcmtk/dcmimgle/diovpln.h ../include/dcmtk/dcmimgle/diutils.h \ ../include/dcmtk/dcmimgle/discalet.h \ @@ -1499,6 +1296,13 @@ diovlay.o: diovlay.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmimgle/didocu.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ @@ -1546,26 +1350,21 @@ diovlimg.o: diovlimg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../include/dcmtk/dcmimgle/diovlimg.h \ + ../include/dcmtk/dcmimgle/dimo2img.h ../include/dcmtk/dcmimgle/dimoimg.h \ + ../include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../include/dcmtk/dcmimgle/diovlimg.h \ - ../include/dcmtk/dcmimgle/dimo2img.h ../include/dcmtk/dcmimgle/dimoimg.h \ - ../include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1623,19 +1422,6 @@ diovpln.o: diovpln.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1645,16 +1431,24 @@ diovpln.o: diovpln.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../include/dcmtk/dcmimgle/diovpln.h ../include/dcmtk/dcmimgle/diutils.h \ ../include/dcmtk/dcmimgle/didefine.h ../include/dcmtk/dcmimgle/didocu.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -1694,18 +1488,5 @@ diutils.o: diutils.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmimgle/diutils.h ../include/dcmtk/dcmimgle/didefine.h diff --git a/dcmimgle/libsrc/didispfn.cc b/dcmimgle/libsrc/didispfn.cc index 494fa239..e1b956b1 100644 --- a/dcmimgle/libsrc/didispfn.cc +++ b/dcmimgle/libsrc/didispfn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1999-2016, OFFIS e.V. + * Copyright (C) 1999-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -336,11 +336,7 @@ int DiDisplayFunction::readConfigFile(const char *filename) { if ((filename != NULL) && (strlen(filename) > 0)) { -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE ifstream file(filename, STD_NAMESPACE ios::in | STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE ifstream file(filename, STD_NAMESPACE ios::in); -#endif + STD_NAMESPACE ifstream file(filename, OFopenmode_in_nocreate); if (file) { char c; diff --git a/dcmimgle/libsrc/dimoimg.cc b/dcmimgle/libsrc/dimoimg.cc index 268c61e2..808483d6 100644 --- a/dcmimgle/libsrc/dimoimg.cc +++ b/dcmimgle/libsrc/dimoimg.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2018 OFFIS e.V. + * Copyright (C) 1996-2019 OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -2020,12 +2020,12 @@ int DiMonoImage::writeImageToDataset(DcmItem &dataset, /* set image resolution */ dataset.putAndInsertUint16(DCM_Columns, Columns); dataset.putAndInsertUint16(DCM_Rows, Rows); -#ifdef PRId32 - sprintf(numBuf, "%" PRId32, NumberOfFrames); +#ifdef PRIu32 + sprintf(numBuf, "%" PRIu32, NumberOfFrames); #elif SIZEOF_LONG == 8 - sprintf(numBuf, "%d", NumberOfFrames); + sprintf(numBuf, "%u", NumberOfFrames); #else - sprintf(numBuf, "%ld", NumberOfFrames); + sprintf(numBuf, "%lu", NumberOfFrames); #endif dataset.putAndInsertString(DCM_NumberOfFrames, numBuf); dataset.putAndInsertUint16(DCM_SamplesPerPixel, 1); diff --git a/dcmiod/include/dcmtk/dcmiod/iodtypes.h b/dcmiod/include/dcmtk/dcmiod/iodtypes.h index ffe78dda..d282ace9 100644 --- a/dcmiod/include/dcmtk/dcmiod/iodtypes.h +++ b/dcmiod/include/dcmtk/dcmiod/iodtypes.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2016, Open Connections GmbH + * Copyright (C) 2015-2019, Open Connections GmbH * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -24,6 +24,7 @@ #include "dcmtk/config/osconfig.h" #include "dcmtk/oflog/oflog.h" +#include "dcmtk/ofstd/ofcond.h" #include "dcmtk/dcmiod/ioddef.h" #include "dcmtk/dcmiod/cielabutil.h" diff --git a/dcmiod/libsrc/Makefile.dep b/dcmiod/libsrc/Makefile.dep index 0cf41a8c..a7cbbde6 100644 --- a/dcmiod/libsrc/Makefile.dep +++ b/dcmiod/libsrc/Makefile.dep @@ -45,17 +45,6 @@ iodcommn.o: iodcommn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ ../include/dcmtk/dcmiod/modpatient.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ @@ -65,7 +54,13 @@ iodcommn.o: iodcommn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -119,11 +114,14 @@ iodcommn.o: iodcommn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/modbase.h \ ../include/dcmtk/dcmiod/modpatientstudy.h \ @@ -178,23 +176,12 @@ iodcontentitemmacro.o: iodcontentitemmacro.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -207,6 +194,12 @@ iodcontentitemmacro.o: iodcontentitemmacro.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \ ../include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -255,11 +248,14 @@ iodcontentitemmacro.o: iodcontentitemmacro.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h iodmacro.o: iodmacro.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmiod/iodmacro.h \ @@ -297,26 +293,21 @@ iodmacro.o: iodmacro.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -372,11 +363,14 @@ iodmacro.o: iodmacro.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ @@ -417,25 +411,14 @@ iodreferences.o: iodreferences.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ ../include/dcmtk/dcmiod/iodreferences.h \ ../include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -445,6 +428,12 @@ iodreferences.o: iodreferences.cc \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -500,22 +489,17 @@ iodrules.o: iodrules.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -558,19 +542,7 @@ iodtypes.o: iodtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h @@ -608,31 +580,26 @@ iodutil.o: iodutil.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -690,26 +657,21 @@ modacquisitioncontext.o: modacquisitioncontext.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -765,11 +727,14 @@ modacquisitioncontext.o: modacquisitioncontext.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ @@ -818,15 +783,10 @@ modbase.o: modbase.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -883,26 +843,21 @@ modcommoninstanceref.o: modcommoninstanceref.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -958,11 +913,14 @@ modcommoninstanceref.o: modcommoninstanceref.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ @@ -1013,22 +971,17 @@ modenhequipment.o: modenhequipment.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmiod/cielabutil.h ../include/dcmtk/dcmiod/modbase.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmiod/cielabutil.h ../include/dcmtk/dcmiod/modbase.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1094,15 +1047,10 @@ modenhusimage.o: modenhusimage.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1165,11 +1113,14 @@ modenhusimage.o: modenhusimage.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h @@ -1217,17 +1168,6 @@ modenhusseries.o: modenhusseries.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ ../include/dcmtk/dcmiod/iodmacro.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ @@ -1237,7 +1177,13 @@ modenhusseries.o: modenhusseries.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -1291,11 +1237,14 @@ modenhusseries.o: modenhusseries.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/modbase.h ../include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h @@ -1341,22 +1290,17 @@ modequipment.o: modequipment.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmiod/cielabutil.h ../include/dcmtk/dcmiod/modbase.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmiod/cielabutil.h ../include/dcmtk/dcmiod/modbase.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1423,15 +1367,10 @@ modfloatingpointimagepixel.o: modfloatingpointimagepixel.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1496,15 +1435,10 @@ modfor.o: modfor.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1570,23 +1504,18 @@ modgeneralimage.o: modgeneralimage.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ + ../include/dcmtk/dcmiod/modbase.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ - ../include/dcmtk/dcmiod/modbase.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1658,15 +1587,10 @@ modgeneralseries.o: modgeneralseries.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1729,11 +1653,14 @@ modgeneralseries.o: modgeneralseries.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h @@ -1782,15 +1709,10 @@ modgeneralstudy.o: modgeneralstudy.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1853,11 +1775,14 @@ modgeneralstudy.o: modgeneralstudy.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h @@ -1905,15 +1830,10 @@ modhelp.o: modhelp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1969,15 +1889,10 @@ modimagepixel.o: modimagepixel.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2046,15 +1961,10 @@ modimagepixelbase.o: modimagepixelbase.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2120,23 +2030,18 @@ modmultiframedimension.o: modmultiframedimension.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ + ../include/dcmtk/dcmiod/modbase.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ - ../include/dcmtk/dcmiod/modbase.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2210,11 +2115,6 @@ modmultiframefg.o: modmultiframefg.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2273,26 +2173,21 @@ modpatient.o: modpatient.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2348,11 +2243,14 @@ modpatient.o: modpatient.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ @@ -2397,26 +2295,21 @@ modpatientstudy.o: modpatientstudy.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2472,11 +2365,14 @@ modpatientstudy.o: modpatientstudy.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \ @@ -2519,26 +2415,21 @@ modsegmentationseries.o: modsegmentationseries.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2594,11 +2485,14 @@ modsegmentationseries.o: modsegmentationseries.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/modbase.h ../include/dcmtk/dcmiod/ioddef.h \ ../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \ @@ -2649,15 +2543,10 @@ modsopcommon.o: modsopcommon.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2732,15 +2621,10 @@ modsynchronization.o: modsynchronization.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2812,15 +2696,10 @@ modusfor.o: modusfor.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ diff --git a/dcmiod/libsrc/iodmacro.cc b/dcmiod/libsrc/iodmacro.cc index 2a0d2cda..e171bfd1 100644 --- a/dcmiod/libsrc/iodmacro.cc +++ b/dcmiod/libsrc/iodmacro.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, Open Connections GmbH + * Copyright (C) 2015-2019, Open Connections GmbH * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -821,7 +821,18 @@ OFCondition ImageSOPInstanceReferenceMacro::getReferencedFrameNumber(OFVectorgetNumberOfValues(); n++) + { + Sint32 sint = 0; + is->getSint32(sint, OFstatic_cast(unsigned long, n)); + if (sint < 0) + { + DCMIOD_WARN("Invalid Referenced Frame Number in Image SOP Instance Reference Macro: " << sint); + return EC_CorruptedData; + } + values.push_back(OFstatic_cast(Uint16, sint)); + } + return EC_Normal; } @@ -846,8 +857,16 @@ OFCondition ImageSOPInstanceReferenceMacro::addReferencedFrameNumber(const Uint1 const OFBool checkValue) { (void)checkValue; - const unsigned long count = ReferencedFrameNumber.getNumberOfValues(); - return ReferencedFrameNumber.putUint16(value, count /* starts with 0, so add new value at the end */); + OFString val; + ReferencedFrameNumber.getOFStringArray(val); + if (ReferencedFrameNumber.getNumberOfValues() > 0) + { + val += "\\"; + } + char buf[10]; + sprintf(buf, "%u", value); + val += buf; + return ReferencedFrameNumber.putOFStringArray(val); } diff --git a/dcmiod/tests/Makefile.dep b/dcmiod/tests/Makefile.dep index 25032727..e1438836 100644 --- a/dcmiod/tests/Makefile.dep +++ b/dcmiod/tests/Makefile.dep @@ -225,11 +225,14 @@ timagepixel.o: timagepixel.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmiod/modbase.h \ ../include/dcmtk/dcmiod/modpatientstudy.h \ diff --git a/dcmjpeg/apps/Makefile.dep b/dcmjpeg/apps/Makefile.dep index 512dac17..50e8a3a0 100644 --- a/dcmjpeg/apps/Makefile.dep +++ b/dcmjpeg/apps/Makefile.dep @@ -33,26 +33,21 @@ dcmcjpeg.o: dcmcjpeg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -108,12 +103,20 @@ dcmcjpeg.o: dcmcjpeg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmjpeg/djdecode.h ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -159,26 +162,21 @@ dcmdjpeg.o: dcmdjpeg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -234,12 +232,20 @@ dcmdjpeg.o: dcmdjpeg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmjpeg/djdecode.h ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -281,26 +287,21 @@ dcmj2pnm.o: dcmj2pnm.cc ../../dcmimage/apps/dcm2pnm.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -356,11 +357,14 @@ dcmj2pnm.o: dcmj2pnm.cc ../../dcmimage/apps/dcm2pnm.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmdata/include/dcmtk/dcmdata/dcrledrg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \ @@ -384,6 +388,11 @@ dcmj2pnm.o: dcmj2pnm.cc ../../dcmimage/apps/dcm2pnm.cc \ ../../dcmimgle/include/dcmtk/dcmimgle/diciefn.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dicielut.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didislut.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimage/include/dcmtk/dcmimage/diregist.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h \ ../../dcmimage/include/dcmtk/dcmimage/dicdefin.h \ @@ -428,26 +437,21 @@ dcmmkdir.o: dcmmkdir.cc ../../dcmdata/apps/dcmgpdir.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -503,13 +507,21 @@ dcmmkdir.o: dcmmkdir.cc ../../dcmdata/apps/dcmgpdir.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmdata/include/dcmtk/dcmdata/dcddirif.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimage/include/dcmtk/dcmimage/diregist.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ diff --git a/dcmjpeg/apps/dcmdjpeg.cc b/dcmjpeg/apps/dcmdjpeg.cc index 64eec45e..b43ee65a 100644 --- a/dcmjpeg/apps/dcmdjpeg.cc +++ b/dcmjpeg/apps/dcmdjpeg.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2001-2018, OFFIS e.V. + * Copyright (C) 2001-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) cmd.addOption("--conv-guess", "+cg", "convert to RGB if YCbCr is guessed by library"); cmd.addOption("--conv-guess-lossy", "+cgl", "convert to RGB if lossy JPEG and YCbCr is\nguessed by the underlying JPEG library"); cmd.addOption("--conv-always", "+ca", "always convert YCbCr to RGB"); - cmd.addOption("--conv-never", "+cn", "never convert color space"); + cmd.addOption("--conv-never", "+cn", "never convert YCbCr to RGB"); cmd.addSubGroup("planar configuration:"); cmd.addOption("--planar-auto", "+pa", "automatically determine planar configuration\nfrom SOP class and color space (default)"); diff --git a/dcmjpeg/docs/dcmdjpeg.man b/dcmjpeg/docs/dcmdjpeg.man index 76218ec6..57906cb2 100644 --- a/dcmjpeg/docs/dcmdjpeg.man +++ b/dcmjpeg/docs/dcmdjpeg.man @@ -113,9 +113,11 @@ color space conversion: # and convert to RGB. +cn --conv-never - never convert color space + never convert YCbCr to RGB - # Never convert color space during decompression. + # Never convert color space from YCbCr to RGB during decompression. + # Note that a conversion from YBR_FULL_422 to YBR_FULL will still take + # place if the source images has been compressed with subsampling. planar configuration: @@ -342,6 +344,6 @@ It is an error if no data dictionary can be loaded. \section dcmdjpeg_copyright COPYRIGHT -Copyright (C) 2001-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2001-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmjpeg/libijg16/jdpred.c b/dcmjpeg/libijg16/jdpred.c index bf7ad400..245a61e3 100644 --- a/dcmjpeg/libijg16/jdpred.c +++ b/dcmjpeg/libijg16/jdpred.c @@ -124,6 +124,16 @@ jpeg_undifference3(j_decompress_ptr cinfo, int comp_index, JPEG_UNUSED(Rb); } +METHODDEF(void) +jpeg_undifference4a(j_decompress_ptr cinfo, int comp_index, + const JDIFFROW diff_buf, const JDIFFROW prev_row, + JDIFFROW undiff_buf, JDIMENSION width) +{ + UNDIFFERENCE_2D(PREDICTOR4A); + JPEG_UNUSED(Rc); + JPEG_UNUSED(Rb); +} + METHODDEF(void) jpeg_undifference4(j_decompress_ptr cinfo, int comp_index, const JDIFFROW diff_buf, const JDIFFROW prev_row, @@ -145,6 +155,17 @@ jpeg_undifference5(j_decompress_ptr cinfo, int comp_index, JPEG_UNUSED(Rb); } +METHODDEF(void) +jpeg_undifference5a(j_decompress_ptr cinfo, int comp_index, + const JDIFFROW diff_buf, const JDIFFROW prev_row, + JDIFFROW undiff_buf, JDIMENSION width) +{ + SHIFT_TEMPS + UNDIFFERENCE_2D(PREDICTOR5A); + JPEG_UNUSED(Rc); + JPEG_UNUSED(Rb); +} + METHODDEF(void) jpeg_undifference6(j_decompress_ptr cinfo, int comp_index, const JDIFFROW diff_buf, const JDIFFROW prev_row, @@ -178,6 +199,17 @@ jpeg_undifference7(j_decompress_ptr cinfo, int comp_index, JPEG_UNUSED(Rb); } +METHODDEF(void) +jpeg_undifference7a(j_decompress_ptr cinfo, int comp_index, + const JDIFFROW diff_buf, const JDIFFROW prev_row, + JDIFFROW undiff_buf, JDIMENSION width) +{ + SHIFT_TEMPS + UNDIFFERENCE_2D(PREDICTOR7A); + JPEG_UNUSED(Rc); + JPEG_UNUSED(Rb); +} + /* * Undifferencer for the first row in a scan or restart interval. The first @@ -211,10 +243,20 @@ jpeg_undifference_first_row(j_decompress_ptr cinfo, int comp_index, losslsd->predict_undifference[comp_index] = jpeg_undifference3; break; case 4: - losslsd->predict_undifference[comp_index] = jpeg_undifference4; + /* DCMTK specific code that is only needed in the 16-bit library. + * Enables workaround for faulty images with integer overflow in predictor 6. + */ + if (cinfo->workaround_options & WORKAROUND_PREDICTOR6OVERFLOW) + losslsd->predict_undifference[comp_index] = jpeg_undifference4a; + else losslsd->predict_undifference[comp_index] = jpeg_undifference4; break; case 5: - losslsd->predict_undifference[comp_index] = jpeg_undifference5; + /* DCMTK specific code that is only needed in the 16-bit library. + * Enables workaround for faulty images with integer overflow in predictor 6. + */ + if (cinfo->workaround_options & WORKAROUND_PREDICTOR6OVERFLOW) + losslsd->predict_undifference[comp_index] = jpeg_undifference5a; + else losslsd->predict_undifference[comp_index] = jpeg_undifference5; break; case 6: /* DCMTK specific code that is only needed in the 16-bit library. @@ -225,7 +267,12 @@ jpeg_undifference_first_row(j_decompress_ptr cinfo, int comp_index, else losslsd->predict_undifference[comp_index] = jpeg_undifference6; break; case 7: - losslsd->predict_undifference[comp_index] = jpeg_undifference7; + /* DCMTK specific code that is only needed in the 16-bit library. + * Enables workaround for faulty images with integer overflow in predictor 6. + */ + if (cinfo->workaround_options & WORKAROUND_PREDICTOR6OVERFLOW) + losslsd->predict_undifference[comp_index] = jpeg_undifference7a; + else losslsd->predict_undifference[comp_index] = jpeg_undifference7; break; } } diff --git a/dcmjpeg/libijg16/jlossls16.h b/dcmjpeg/libijg16/jlossls16.h index 6c7ea9ac..a3b69593 100644 --- a/dcmjpeg/libijg16/jlossls16.h +++ b/dcmjpeg/libijg16/jlossls16.h @@ -25,12 +25,14 @@ #define PREDICTOR6 (int) ((IJG_INT32) Rb + RIGHT_SHIFT((IJG_INT32) Ra - (IJG_INT32) Rc, 1)) #define PREDICTOR7 (int) RIGHT_SHIFT((IJG_INT32) Ra + (IJG_INT32) Rb, 1) -/* This is an incorrect predictor that causes an overflow for images with 16 bits/pixel. +/* This is a set of incorrect predictors that cause overflows for images with 16 bits/pixel. * There is a known implementation of JPEG lossless that creates such incorrect images, - * and we need this predictor to be able to correctly decode such incorrect images. + * and we need these predictors to be able to correctly decode such incorrect images. */ -#define PREDICTOR6A (int) ((INT16) Rb + RIGHT_SHIFT((INT16) Ra - (INT16) Rc, 1)) - +#define PREDICTOR4A (int) ((INT16) Ra + (INT16) Rb - (INT16) Rc) +#define PREDICTOR5A (int) ((INT16) Ra + RIGHT_SHIFT((INT16) Rb - (INT16) Rc, 1)) +#define PREDICTOR6A (int) ((INT16) Rb + RIGHT_SHIFT((INT16) Ra - (INT16) Rc, 1)) +#define PREDICTOR7A (int) RIGHT_SHIFT((INT16) Ra + (INT16) Rb, 1) typedef JMETHOD(void, predict_difference_method_ptr, (j_compress_ptr cinfo, int ci, diff --git a/dcmjpeg/libsrc/Makefile.dep b/dcmjpeg/libsrc/Makefile.dep index 5b9d3ec8..b0623125 100644 --- a/dcmjpeg/libsrc/Makefile.dep +++ b/dcmjpeg/libsrc/Makefile.dep @@ -45,15 +45,10 @@ ddpiimpl.o: ddpiimpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -125,24 +120,19 @@ dipijpeg.o: dipijpeg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -202,28 +192,23 @@ djcodecd.o: djcodecd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmjpeg/djdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -279,28 +264,23 @@ djcodece.o: djcodece.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmjpeg/djdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -380,22 +360,12 @@ djcparam.o: djcparam.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -437,22 +407,12 @@ djdecbas.o: djdecbas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -505,22 +465,12 @@ djdecext.o: djdecext.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -574,22 +524,12 @@ djdeclol.o: djdeclol.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -643,18 +583,6 @@ djdecode.o: djdecode.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmjpeg/djdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dccodec.h \ @@ -663,6 +591,8 @@ djdecode.o: djdecode.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djdecbas.h ../include/dcmtk/dcmjpeg/djcodecd.h \ ../include/dcmtk/dcmjpeg/djdecext.h ../include/dcmtk/dcmjpeg/djdecsps.h \ ../include/dcmtk/dcmjpeg/djdecpro.h ../include/dcmtk/dcmjpeg/djdecsv1.h \ @@ -704,22 +634,12 @@ djdecpro.o: djdecpro.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -773,22 +693,12 @@ djdecsps.o: djdecsps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -842,22 +752,12 @@ djdecsv1.o: djdecsv1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -909,21 +809,9 @@ djdijg12.o: djdijg12.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmjpeg/djutils.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmjpeg/djdefine.h ../include/dcmtk/dcmjpeg/djcparam.h \ @@ -931,6 +819,8 @@ djdijg12.o: djdijg12.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmjpeg/libijg12/jpeglib12.h ../../dcmjpeg/libijg12/jconfig12.h \ ../../dcmjpeg/libijg12/jmorecfg12.h ../../dcmjpeg/libijg12/jerror12.h @@ -969,21 +859,9 @@ djdijg16.o: djdijg16.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmjpeg/djutils.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmjpeg/djdefine.h ../include/dcmtk/dcmjpeg/djcparam.h \ @@ -991,6 +869,8 @@ djdijg16.o: djdijg16.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmjpeg/libijg16/jpeglib16.h ../../dcmjpeg/libijg16/jconfig16.h \ ../../dcmjpeg/libijg16/jmorecfg16.h ../../dcmjpeg/libijg16/jerror16.h @@ -1029,21 +909,9 @@ djdijg8.o: djdijg8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmjpeg/djutils.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmjpeg/djdefine.h ../include/dcmtk/dcmjpeg/djcparam.h \ @@ -1051,6 +919,8 @@ djdijg8.o: djdijg8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmjpeg/libijg8/jpeglib8.h ../../dcmjpeg/libijg8/jconfig8.h \ ../../dcmjpeg/libijg8/jmorecfg8.h ../../dcmjpeg/libijg8/jerror8.h @@ -1091,27 +961,17 @@ djeijg12.o: djeijg12.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ - ../include/dcmtk/dcmjpeg/djutils.h ../include/dcmtk/dcmjpeg/djdefine.h \ - ../include/dcmtk/dcmjpeg/djcparam.h \ + ../include/dcmtk/dcmjpeg/djutils.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmjpeg/djdefine.h ../include/dcmtk/dcmjpeg/djcparam.h \ ../../dcmdata/include/dcmtk/dcmdata/dccodec.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmjpeg/libijg12/jpeglib12.h ../../dcmjpeg/libijg12/jconfig12.h \ ../../dcmjpeg/libijg12/jmorecfg12.h ../../dcmjpeg/libijg12/jerror12.h \ @@ -1153,27 +1013,17 @@ djeijg16.o: djeijg16.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ - ../include/dcmtk/dcmjpeg/djutils.h ../include/dcmtk/dcmjpeg/djdefine.h \ - ../include/dcmtk/dcmjpeg/djcparam.h \ + ../include/dcmtk/dcmjpeg/djutils.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmjpeg/djdefine.h ../include/dcmtk/dcmjpeg/djcparam.h \ ../../dcmdata/include/dcmtk/dcmdata/dccodec.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmjpeg/libijg16/jpeglib16.h ../../dcmjpeg/libijg16/jconfig16.h \ ../../dcmjpeg/libijg16/jmorecfg16.h ../../dcmjpeg/libijg16/jerror16.h \ @@ -1215,27 +1065,17 @@ djeijg8.o: djeijg8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ - ../include/dcmtk/dcmjpeg/djutils.h ../include/dcmtk/dcmjpeg/djdefine.h \ - ../include/dcmtk/dcmjpeg/djcparam.h \ + ../include/dcmtk/dcmjpeg/djutils.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../include/dcmtk/dcmjpeg/djdefine.h ../include/dcmtk/dcmjpeg/djcparam.h \ ../../dcmdata/include/dcmtk/dcmdata/dccodec.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmjpeg/libijg8/jpeglib8.h ../../dcmjpeg/libijg8/jconfig8.h \ ../../dcmjpeg/libijg8/jmorecfg8.h ../../dcmjpeg/libijg8/jerror8.h \ @@ -1277,22 +1117,12 @@ djencbas.o: djencbas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -1345,22 +1175,12 @@ djencext.o: djencext.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -1414,22 +1234,12 @@ djenclol.o: djenclol.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -1483,18 +1293,6 @@ djencode.o: djencode.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmjpeg/djdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ @@ -1503,6 +1301,8 @@ djencode.o: djencode.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djencbas.h ../include/dcmtk/dcmjpeg/djcodece.h \ ../include/dcmtk/dcmjpeg/djencext.h ../include/dcmtk/dcmjpeg/djencsps.h \ ../include/dcmtk/dcmjpeg/djencpro.h ../include/dcmtk/dcmjpeg/djencsv1.h \ @@ -1544,22 +1344,12 @@ djencpro.o: djencpro.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -1613,22 +1403,12 @@ djencsps.o: djencsps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -1682,22 +1462,12 @@ djencsv1.o: djencsv1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ @@ -1760,21 +1530,11 @@ djrplol.o: djrplol.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djdefine.h djrploss.o: djrploss.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmjpeg/djrploss.h \ @@ -1822,21 +1582,11 @@ djrploss.o: djrploss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpeg/djdefine.h djutils.o: djutils.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmjpeg/djutils.h \ @@ -1874,27 +1624,22 @@ djutils.o: djutils.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \ ../include/dcmtk/dcmjpeg/djdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ diff --git a/dcmjpeg/libsrc/djcodece.cc b/dcmjpeg/libsrc/djcodece.cc index 897dca4b..f61d9531 100644 --- a/dcmjpeg/libsrc/djcodece.cc +++ b/dcmjpeg/libsrc/djcodece.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2001-2018, OFFIS e.V. + * Copyright (C) 2001-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -166,10 +166,15 @@ OFCondition DJCodecEncoder::encode( result = encodeColorImage(OFTrue, OFreinterpret_cast(DcmItem*, dataset), toRepParam, pixSeq, djcp, compressionRatio); break; case EPI_Unknown: - case EPI_Missing: // unknown color model - bail out result = EJ_UnsupportedPhotometricInterpretation; break; + case EPI_Missing: + // photometric interpretation missing. If ACR-NEMA compatibility is activated, we treat this as MONOCHOME2, otherwise we report an error + if (djcp->getAcrNemaCompatibility()) + result = encodeMonochromeImage(OFreinterpret_cast(DcmItem*, dataset), toRepParam, pixSeq, djcp, compressionRatio); + else result = EJ_UnsupportedPhotometricInterpretation; + break; } // the following operations do not affect the Image Pixel Module @@ -315,7 +320,11 @@ OFCondition DJCodecEncoder::encodeColorImage( } if (dimage == NULL) result = EC_MemoryExhausted; - else if (dimage->getStatus() != EIS_Normal) result = EC_IllegalCall; // should return dimage->getStatus() + else if (dimage->getStatus() != EIS_Normal) + { + DCMJPEG_WARN("Color encoder: " << DicomImage::getString(dimage->getStatus())); + result = EC_IllegalCall; + } // don't render overlays if (result.good()) @@ -950,7 +959,11 @@ OFCondition DJCodecEncoder::encodeMonochromeImage( // create DicomImage object. Will fail if dcmimage has not been activated in main(). // transfer syntax can be any uncompressed one. DicomImage dimage(dataset, EXS_LittleEndianImplicit, flags); // read all frames - if (dimage.getStatus() != EIS_Normal) result = EC_IllegalCall; // should return dimage.getStatus() + if (dimage.getStatus() != EIS_Normal) + { + DCMJPEG_WARN("Monochrome encoder: " << DicomImage::getString(dimage.getStatus())); + result = EC_IllegalCall; + } // don't render overlays dimage.hideAllOverlays(); diff --git a/dcmjpeg/libsrc/djutils.cc b/dcmjpeg/libsrc/djutils.cc index e7ec4a2c..968b9eae 100644 --- a/dcmjpeg/libsrc/djutils.cc +++ b/dcmjpeg/libsrc/djutils.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2018, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -15,7 +15,7 @@ * * Author: Norbert Olges, Marco Eichelberg * - * Purpose: (STATUS: OK) + * Purpose: Various helper methods for the JPEG encoder * */ @@ -65,9 +65,10 @@ EP_Interpretation DcmJpegHelper::getPhotometricInterpretation(DcmItem *item) if (photometric == PhotometricInterpretationNames[i].Name) return PhotometricInterpretationNames[i].Type; i++; } + return EPI_Unknown; } } - return EPI_Unknown; + return EPI_Missing; } void DcmJpegHelper::fixPadding( diff --git a/dcmjpls/apps/Makefile.dep b/dcmjpls/apps/Makefile.dep index 9a8cc769..3877ad97 100644 --- a/dcmjpls/apps/Makefile.dep +++ b/dcmjpls/apps/Makefile.dep @@ -33,26 +33,21 @@ dcmcjpls.o: dcmcjpls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -108,12 +103,20 @@ dcmcjpls.o: dcmcjpls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimage/include/dcmtk/dcmimage/diregist.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ @@ -158,26 +161,21 @@ dcmdjpls.o: dcmdjpls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -233,12 +231,20 @@ dcmdjpls.o: dcmdjpls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimage/include/dcmtk/dcmimage/diregist.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diutils.h \ @@ -282,26 +288,21 @@ dcml2pnm.o: dcml2pnm.cc ../../dcmimage/apps/dcm2pnm.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -357,11 +358,14 @@ dcml2pnm.o: dcml2pnm.cc ../../dcmimage/apps/dcm2pnm.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmdata/include/dcmtk/dcmdata/dcrledrg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \ @@ -385,6 +389,11 @@ dcml2pnm.o: dcml2pnm.cc ../../dcmimage/apps/dcm2pnm.cc \ ../../dcmimgle/include/dcmtk/dcmimgle/diciefn.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dicielut.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didislut.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimage/include/dcmtk/dcmimage/diregist.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h \ ../../dcmimage/include/dcmtk/dcmimage/dicdefin.h \ diff --git a/dcmjpls/apps/dcmcjpls.cc b/dcmjpls/apps/dcmcjpls.cc index ebe44a5d..9e958d53 100644 --- a/dcmjpls/apps/dcmcjpls.cc +++ b/dcmjpls/apps/dcmcjpls.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2017, OFFIS e.V. + * Copyright (C) 2007-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -71,15 +71,12 @@ int main(int argc, char *argv[]) // JPEG-LS encoding options E_TransferSyntax opt_oxfer = EXS_JPEGLSLossless; OFBool opt_useLosslessProcess = OFTrue; + OFBool opt_useFFpadding = OFTrue; - OFCmdUnsignedInt opt_t1 = 3; - OFCmdUnsignedInt opt_t2 = 7; - OFCmdUnsignedInt opt_t3 = 21; - - OFCmdUnsignedInt opt_reset = 64; - OFCmdUnsignedInt opt_limit = 0; - - OFBool opt_use_custom_options = OFFalse; + OFCmdUnsignedInt opt_t1 = 0; + OFCmdUnsignedInt opt_t2 = 0; + OFCmdUnsignedInt opt_t3 = 0; + OFCmdUnsignedInt opt_reset = 0; // JPEG-LS options OFCmdUnsignedInt opt_nearlossless_deviation = 2; @@ -152,13 +149,14 @@ LICENSE_FILE_DECLARE_COMMAND_LINE_OPTIONS "set JPEG-LS encoding parameter threshold 3"); cmd.addOption("--reset", "+rs", 1, "[r]eset: integer (default: 64)", "set JPEG-LS encoding parameter reset"); - cmd.addOption("--limit", "+lm", 1, "[l]imit: integer (default: 0)", - "set JPEG-LS encoding parameter limit"); cmd.addSubGroup("JPEG-LS interleave:"); cmd.addOption("--interleave-line", "+il", "force line-interleaved JPEG-LS images (default)"); cmd.addOption("--interleave-sample", "+is", "force sample-interleaved JPEG-LS images"); cmd.addOption("--interleave-none", "+in", "force uninterleaved JPEG-LS images"); cmd.addOption("--interleave-default", "+iv", "use the fastest possible interleave mode"); + cmd.addSubGroup("JPEG-LS padding of odd-length bitstreams:"); + cmd.addOption("--padding-standard", "+ps", "pad with extended EOI marker (default)"); + cmd.addOption("--padding-zero", "+pz", "pad with zero byte (non-standard)"); cmd.addGroup("encapsulated pixel data encoding options:"); cmd.addSubGroup("pixel data fragmentation:"); @@ -294,27 +292,18 @@ LICENSE_FILE_EVALUATE_COMMAND_LINE_OPTIONS if (cmd.findOption("--threshold1")) { app.checkValue(cmd.getValueAndCheckMin(opt_t1, OFstatic_cast(OFCmdUnsignedInt, 1))); - opt_use_custom_options = OFTrue; } if (cmd.findOption("--threshold2")) { app.checkValue(cmd.getValueAndCheckMin(opt_t2, OFstatic_cast(OFCmdUnsignedInt, 1))); - opt_use_custom_options = OFTrue; } if (cmd.findOption("--threshold3")) { app.checkValue(cmd.getValueAndCheckMin(opt_t3, OFstatic_cast(OFCmdUnsignedInt, 1))); - opt_use_custom_options = OFTrue; } if (cmd.findOption("--reset")) { app.checkValue(cmd.getValueAndCheckMin(opt_reset, OFstatic_cast(OFCmdUnsignedInt, 1))); - opt_use_custom_options = OFTrue; - } - if (cmd.findOption("--limit")) - { - app.checkValue(cmd.getValue(opt_limit)); - opt_use_custom_options = OFTrue; } cmd.endOptionBlock(); @@ -338,6 +327,18 @@ LICENSE_FILE_EVALUATE_COMMAND_LINE_OPTIONS } cmd.endOptionBlock(); + // padding + cmd.beginOptionBlock(); + if (cmd.findOption("--padding-standard")) + { + opt_useFFpadding = OFTrue; + } + if (cmd.findOption("--padding-zero")) + { + opt_useFFpadding = OFFalse; + } + cmd.endOptionBlock(); + // encapsulated pixel data encoding options // pixel data fragmentation options cmd.beginOptionBlock(); @@ -404,11 +405,11 @@ LICENSE_FILE_EVALUATE_COMMAND_LINE_OPTIONS OFLOG_DEBUG(dcmcjplsLogger, rcsid << OFendl); // register global compression codecs - DJLSEncoderRegistration::registerCodecs(opt_use_custom_options, + DJLSEncoderRegistration::registerCodecs( OFstatic_cast(Uint16, opt_t1), OFstatic_cast(Uint16, opt_t2), OFstatic_cast(Uint16, opt_t3), - OFstatic_cast(Uint16, opt_reset), OFstatic_cast(Uint16, opt_limit), + OFstatic_cast(Uint16, opt_reset), opt_prefer_cooked, opt_fragmentSize, opt_createOffsetTable, - opt_uidcreation, opt_secondarycapture, opt_interleaveMode); + opt_uidcreation, opt_secondarycapture, opt_interleaveMode, opt_useFFpadding); /* make sure data dictionary is loaded */ if (!dcmDataDict.isDictionaryLoaded()) diff --git a/dcmjpls/apps/dcmdjpls.cc b/dcmjpls/apps/dcmdjpls.cc index 5bb88421..006ddad3 100644 --- a/dcmjpls/apps/dcmdjpls.cc +++ b/dcmjpls/apps/dcmdjpls.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2017, OFFIS e.V. + * Copyright (C) 2007-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -71,6 +71,7 @@ int main(int argc, char *argv[]) E_FileReadMode opt_readMode = ERM_autoDetect; E_FileWriteMode opt_writeMode = EWM_fileformat; E_TransferSyntax opt_ixfer = EXS_Unknown; + OFBool opt_forceSingleFragmentPerFrame = OFFalse; // parameter JLS_UIDCreation opt_uidcreation = EJLSUC_default; @@ -113,6 +114,8 @@ LICENSE_FILE_DECLARE_COMMAND_LINE_OPTIONS cmd.addSubGroup("SOP Instance UID:"); cmd.addOption("--uid-default", "+ud", "keep same SOP Instance UID (default)"); cmd.addOption("--uid-always", "+ua", "always assign new UID"); + cmd.addSubGroup("workaround options for incorrect JPEG-LS encodings:"); + cmd.addOption("--workaround-incpl", "+wi", "enable workaround for incomplete JPEG-LS data"); cmd.addSubGroup("other processing options:"); cmd.addOption("--ignore-offsettable", "+io", "ignore offset table when decompressing"); @@ -184,6 +187,7 @@ LICENSE_FILE_EVALUATE_COMMAND_LINE_OPTIONS if (cmd.findOption("--uid-always")) opt_uidcreation = EJLSUC_always; cmd.endOptionBlock(); + if (cmd.findOption("--workaround-incpl")) opt_forceSingleFragmentPerFrame = OFTrue; if (cmd.findOption("--ignore-offsettable")) opt_ignoreOffsetTable = OFTrue; cmd.beginOptionBlock(); @@ -255,7 +259,11 @@ LICENSE_FILE_EVALUATE_COMMAND_LINE_OPTIONS OFLOG_DEBUG(dcmdjplsLogger, rcsid << OFendl); // register global decompression codecs - DJLSDecoderRegistration::registerCodecs(opt_uidcreation, opt_planarconfig, opt_ignoreOffsetTable); + DJLSDecoderRegistration::registerCodecs( + opt_uidcreation, + opt_planarconfig, + opt_ignoreOffsetTable, + opt_forceSingleFragmentPerFrame); /* make sure data dictionary is loaded */ if (!dcmDataDict.isDictionaryLoaded()) diff --git a/dcmjpls/docs/dcmcjpls.man b/dcmjpls/docs/dcmcjpls.man index b1cea9a1..b5180db7 100644 --- a/dcmjpls/docs/dcmcjpls.man +++ b/dcmjpls/docs/dcmcjpls.man @@ -130,21 +130,21 @@ lossless compression: JPEG-LS compression: - +t1 --threshold1 [t]hreshhold: integer (default for 8 bpp: 3) + +t1 --threshold1 [t]hreshhold: integer set JPEG-LS encoding parameter threshold 1 - +t2 --threshold2 [t]hreshhold: integer (default for 8 bpp: 7) + +t2 --threshold2 [t]hreshhold: integer set JPEG-LS encoding parameter threshold 2 - +t3 --threshold3 [t]hreshhold: integer (default for 8 bpp: 21) + +t3 --threshold3 [t]hreshhold: integer set JPEG-LS encoding parameter threshold 3 + # By default, the values for T1, T2, T3 are computed based on + # the number of bits per sample. + +rs --reset [r]eset: integer (default: 64) set JPEG-LS encoding parameter reset - +lm --limit [l]imit: integer (default: 0) - set JPEG-LS encoding parameter limit - JPEG-LS interleave: +il --interleave-line @@ -174,6 +174,23 @@ JPEG-LS interleave: # This flag selects an interleave mode based on the source image's mode. # If possible, the image is not converted to a different interleave mode. + +JPEG-LS padding of odd-length bitstreams: + + +ps --padding-standard + pad with extended EOI marker (default) + + # Pad odd-length JPEG-LS bitstreams by writing an extended end of image + # segment marker FF FF D9, as required by the DICOM standard. + + +pz --padding-zero + pad with zero byte (non-standard) + + # Pad odd-length JPEG-LS bitstreams by writing a zero byte after the + # end of image segment marker, i.e. FF D9 00. This is not DICOM conformant + # but required for interoperability with the HP LOCO reference implementation, + # which does not support extended JPEG-LS bitstreams. + \endverbatim \subsection dcmcjpls_enc_pix_data_encoding_opt encapsulated pixel data encoding options @@ -378,6 +395,6 @@ It is an error if no data dictionary can be loaded. \section dcmcjpls_copyright COPYRIGHT -Copyright (C) 2009-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2009-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmjpls/docs/dcmdjpls.man b/dcmjpls/docs/dcmdjpls.man index 86c45e71..81a1a6b9 100644 --- a/dcmjpls/docs/dcmdjpls.man +++ b/dcmjpls/docs/dcmdjpls.man @@ -120,6 +120,11 @@ SOP Instance UID: # Always assigns a new SOP instance UID. +workaround options for incorrect JPEG-LS encodings: + + +wi --workaround-incpl + enable workaround for incomplete JPEG-LS data + other processing options: +io --ignore-offsettable diff --git a/dcmjpls/include/dcmtk/dcmjpls/djcodece.h b/dcmjpls/include/dcmtk/dcmjpls/djcodece.h index 09465627..e2dbc4f8 100644 --- a/dcmjpls/include/dcmtk/dcmjpls/djcodece.h +++ b/dcmjpls/include/dcmtk/dcmjpls/djcodece.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2017, OFFIS e.V. + * Copyright (C) 2007-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -31,6 +31,7 @@ class DJLSRepresentationParameter; class DJLSCodecParameter; class DicomImage; +struct JlsCustomParameters; /** abstract codec class for JPEG-LS encoders. * This abstract class contains most of the application logic @@ -350,11 +351,27 @@ private: * @param bufSize size of the buffer in bytes * @param bytesWritten number of bytes written to buffer; value is increased * if this method adds a pad byte. + * @param useFFpadding true if a standard-conforming extended EOI marker + * should be used for padding an odd-length bitstream */ static void fixPaddingIfNecessary( Uint8 *buffer, size_t bufSize, - unsigned long &bytesWritten); + unsigned long &bytesWritten, + OFBool useFFpadding); + + /** compute the parameters for the CharLS JlsCustomParameters struct, which maintains + * the JPEG-LS encoding process parameters T1, T2, T3, MAXVAL and RESET. + * @param custom reference to initialized JlsCustomParameters object, values filled by this method + * @param bitsAllocated number of bits allocated + * @param nearLosslessDeviation parameter NEAR of near-lossless mode + * @param djcp parameters for the codec + */ + static void setCustomParameters( + JlsCustomParameters& custom, + Uint16 bitsAllocated, + Uint16 nearLosslessDeviation, + const DJLSCodecParameter *djcp); }; diff --git a/dcmjpls/include/dcmtk/dcmjpls/djcparam.h b/dcmjpls/include/dcmtk/dcmjpls/djcparam.h index be5eb9c6..524fd736 100644 --- a/dcmjpls/include/dcmtk/dcmjpls/djcparam.h +++ b/dcmjpls/include/dcmtk/dcmjpls/djcparam.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2011, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -48,13 +48,12 @@ public: }; /** constructor, for use with encoders. - * @param jpls_optionsEnabled enable/disable use of all five JPEG-LS parameters + * @param preferCookedEncoding true if the "cooked" lossless encoder should be preferred over the "raw" one + * (which should be the default) * @param jpls_t1 JPEG-LS parameter "Threshold 1" (used for quantization) * @param jpls_t2 JPEG-LS parameter "Threshold 2" * @param jpls_t3 JPEG-LS parameter "Threshold 3" * @param jpls_reset JPEG-LS parameter "RESET", i.e., value at which the counters A, B, and N are halved. - * @param jpls_limit JPEG-LS parameter "LIMIT" - * @param preferCookedEncoding true if the "cooked" lossless encoder should be preferred over the "raw" one * @param fragmentSize maximum fragment size (in kbytes) for compression, 0 for unlimited. * @param createOffsetTable create offset table during image compression * @param uidCreation mode for SOP Instance UID creation @@ -62,32 +61,35 @@ public: * @param planarConfiguration flag describing how planar configuration of decompressed color images should be handled * @param ignoreOffsetTable flag indicating whether to ignore the offset table when decompressing multiframe images * @param jplsInterleaveMode flag describing which interleave the JPEG-LS datastream should use + * @param useFFbitstreamPadding flag indicating whether the JPEG-LS bitstream should be FF padded as required by DICOM. */ DJLSCodecParameter( - OFBool jpls_optionsEnabled, - Uint16 jpls_t1 = 3, // these are the defaults for 8bpp in lossless mode - Uint16 jpls_t2 = 7, - Uint16 jpls_t3 = 21, - Uint16 jpls_reset = 64, - Uint16 jpls_limit = 0, - OFBool preferCookedEncoding = OFTrue, + OFBool preferCookedEncoding, + Uint16 jpls_t1 = 0, + Uint16 jpls_t2 = 0, + Uint16 jpls_t3 = 0, + Uint16 jpls_reset = 0, Uint32 fragmentSize = 0, OFBool createOffsetTable = OFTrue, JLS_UIDCreation uidCreation = EJLSUC_default, OFBool convertToSC = OFFalse, JLS_PlanarConfiguration planarConfiguration = EJLSPC_restore, OFBool ignoreOffsetTable = OFFalse, - interleaveMode jplsInterleaveMode = interleaveLine); + interleaveMode jplsInterleaveMode = interleaveLine, + OFBool useFFbitstreamPadding = OFTrue ); /** constructor, for use with decoders. Initializes all encoder options to defaults. - * @param uidCreation mode for SOP Instance UID creation (used both for encoding and decoding) - * @param planarConfiguration flag describing how planar configuration of decompressed color images should be handled - * @param ignoreOffsetTable flag indicating whether to ignore the offset table when decompressing multiframe images + * @param uidCreation mode for SOP Instance UID creation (used both for encoding and decoding) + * @param planarConfiguration flag describing how planar configuration of decompressed color images should be handled + * @param ignoreOffsetTable flag indicating whether to ignore the offset table when decompressing multiframe images + * @param forceSingleFragmentPerFrame while decompressing a multiframe image, assume one fragment per frame even if the JPEG + * data for some frame is incomplete */ DJLSCodecParameter( JLS_UIDCreation uidCreation = EJLSUC_default, JLS_PlanarConfiguration planarConfiguration = EJLSPC_restore, - OFBool ignoreOffsetTable = OFFalse); + OFBool ignoreOffsetTable = OFFalse, + OFBool forceSingleFragmentPerFrame = OFFalse); /// copy constructor DJLSCodecParameter(const DJLSCodecParameter& arg); @@ -96,7 +98,7 @@ public: virtual ~DJLSCodecParameter(); /** this methods creates a copy of type DcmCodecParameter * - * it must be overweritten in every subclass. + * it must be overwritten in every subclass. * @return copy of this object */ virtual DcmCodecParameter *clone() const; @@ -187,22 +189,6 @@ public: return jpls_reset_; } - /** returns JPEG-LS parameter LIMIT - * @return JPEG-LS parameter LIMIT - */ - Uint16 getLimit() const - { - return jpls_t1_; - } - - /** returns true if JPEG-LS parameters T1-T3, RESET and LIMIT are enabled, false otherwise - * @return true if JPEG-LS parameters T1-T3, RESET and LIMIT are enabled, false otherwise - */ - OFBool getUseCustomOptions() const - { - return jpls_optionsEnabled_; - } - /** returns true if the offset table should be ignored when decompressing multiframe images * @return true if the offset table should be ignored when decompressing multiframe images */ @@ -219,6 +205,22 @@ public: return jplsInterleaveMode_; } + /** returns flag indicating whether one fragment per frame should be enforced while decoding + * @return flag indicating whether one fragment per frame should be enforced while decoding + */ + OFBool getForceSingleFragmentPerFrame() const + { + return forceSingleFragmentPerFrame_; + } + + /** returns flag indicating whether odd-length bitstreams should be padded as FF FF D9 + * @return flag indicating whether odd-length bitstreams should be padded as FF FF D9 + */ + OFBool getUseFFbitstreamPadding() const + { + return useFFbitstreamPadding_; + } + private: /// private undefined copy assignment operator @@ -227,33 +229,27 @@ private: // **************************************************** // **** Parameters describing the encoding process **** - /// enable/disable use of all five JPEG-LS parameters - OFBool jpls_optionsEnabled_; + /// flag indicating if the "cooked" lossless encoder should be preferred over the "raw" one + OFBool preferCookedEncoding_; - /// JPEG-LS parameter "Threshold 1" (used for quantization) + /// JPEG-LS parameter "Threshold 1" (used for quantization), 0 if unused Uint16 jpls_t1_; - /// JPEG-LS parameter "Threshold 2" + /// JPEG-LS parameter "Threshold 2", 0 if unused Uint16 jpls_t2_; - /// JPEG-LS parameter "Threshold 3" + /// JPEG-LS parameter "Threshold 3", 0 if unused Uint16 jpls_t3_; - /// JPEG-LS parameter "RESET", i.e., value at which the counters A, B, and N are halved. + /// JPEG-LS parameter "RESET", i.e., value at which the counters A, B, and N are halved. 0 if unused. Uint16 jpls_reset_; - /// JPEG-LS parameter "LIMIT" - Uint16 jpls_limit_; - /// maximum fragment size (in kbytes) for compression, 0 for unlimited. Uint32 fragmentSize_; /// create offset table during image compression OFBool createOffsetTable_; - /// Flag indicating if the "cooked" lossless encoder should be preferred over the "raw" one - OFBool preferCookedEncoding_; - /// mode for SOP Instance UID creation (used both for encoding and decoding) JLS_UIDCreation uidCreation_; @@ -263,6 +259,14 @@ private: /// Flag describing the interleave mode which the encoder will use interleaveMode jplsInterleaveMode_; + /** When true, a JPEG-LS bitstream of odd length is padded by extending the + * FF D9 "end of image" marker to FF FF D9, as required by DICOM. When false, + * the bitstream is written as FF D9 00, which is not standard compliant, but + * required for interoperability with the HP LOCO reference implementation, + * which does not support FF padded markers. + */ + OFBool useFFbitstreamPadding_; + // **************************************************** // **** Parameters describing the decoding process **** @@ -272,6 +276,11 @@ private: /// flag indicating if temporary files should be kept, false if they should be deleted after use OFBool ignoreOffsetTable_; + /** while decompressing a multiframe image, + * assume one fragment per frame even if the JPEG data for some frame is incomplete + */ + OFBool forceSingleFragmentPerFrame_; + }; diff --git a/dcmjpls/include/dcmtk/dcmjpls/djdecode.h b/dcmjpls/include/dcmtk/dcmjpls/djdecode.h index 6b62fd7e..f03dc46e 100644 --- a/dcmjpls/include/dcmtk/dcmjpls/djdecode.h +++ b/dcmjpls/include/dcmtk/dcmjpls/djdecode.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2011, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -44,11 +44,14 @@ public: * @param planarconfig flag indicating how planar configuration * of color images should be encoded upon decompression. * @param ignoreOffsetTable flag indicating whether to ignore the offset table when decompressing multiframe images + * @param forceSingleFragmentPerFrame while decompressing a multiframe image, + * assume one fragment per frame even if the JPEG data for some frame is incomplete */ static void registerCodecs( JLS_UIDCreation uidcreation = EJLSUC_default, JLS_PlanarConfiguration planarconfig = EJLSPC_restore, - OFBool ignoreOffsetTable = OFFalse); + OFBool ignoreOffsetTable = OFFalse, + OFBool forceSingleFragmentPerFrame = OFFalse); /** deregisters decoders. * Attention: Must not be called while other threads might still use diff --git a/dcmjpls/include/dcmtk/dcmjpls/djencode.h b/dcmjpls/include/dcmtk/dcmjpls/djencode.h index 6db8537a..78a74c9f 100644 --- a/dcmjpls/include/dcmtk/dcmjpls/djencode.h +++ b/dcmjpls/include/dcmtk/dcmjpls/djencode.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2011, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -41,32 +41,30 @@ public: /** registers encoders for all supported JPEG-LS processes. * If already registered, call is ignored unless cleanup() has * been performed before. - * @param jpls_optionsEnabled enable/disable use of all five JPEG-LS parameters * @param jpls_t1 JPEG-LS parameter "Threshold 1" (used for quantization) * @param jpls_t2 JPEG-LS parameter "Threshold 2" * @param jpls_t3 JPEG-LS parameter "Threshold 3" * @param jpls_reset JPEG-LS parameter "RESET", i.e., value at which the counters A, B, and N are halved. - * @param jpls_limit JPEG-LS parameter "LIMIT" * @param preferCookedEncoding true if the "cooked" lossless encoder should be preferred over the "raw" one * @param fragmentSize maximum fragment size (in kbytes) for compression, 0 for unlimited. * @param createOffsetTable create offset table during image compression * @param uidCreation mode for SOP Instance UID creation * @param convertToSC flag indicating whether image should be converted to Secondary Capture upon compression * @param jplsInterleaveMode flag describing which interleave the JPEG-LS datastream should use + * @param useFFbitstreamPadding flag indicating whether the JPEG-LS bitstream should be FF padded as required by DICOM. */ static void registerCodecs( - OFBool jpls_optionsEnabled = OFFalse, - Uint16 jpls_t1 = 3, - Uint16 jpls_t2 = 7, - Uint16 jpls_t3 = 21, - Uint16 jpls_reset = 64, - Uint16 jpls_limit = 0, + Uint16 jpls_t1 = 0, + Uint16 jpls_t2 = 0, + Uint16 jpls_t3 = 0, + Uint16 jpls_reset = 0, OFBool preferCookedEncoding = OFTrue, Uint32 fragmentSize = 0, OFBool createOffsetTable = OFTrue, JLS_UIDCreation uidCreation = EJLSUC_default, OFBool convertToSC = OFFalse, - DJLSCodecParameter::interleaveMode jplsInterleaveMode = DJLSCodecParameter::interleaveDefault); + DJLSCodecParameter::interleaveMode jplsInterleaveMode = DJLSCodecParameter::interleaveDefault, + OFBool useFFbitstreamPadding = OFTrue ); /** deregisters encoders. * Attention: Must not be called while other threads might still use diff --git a/dcmjpls/libcharls/jpegls.cc b/dcmjpls/libcharls/jpegls.cc index c451702d..f90c2ae5 100644 --- a/dcmjpls/libcharls/jpegls.cc +++ b/dcmjpls/libcharls/jpegls.cc @@ -1,12 +1,12 @@ -// -// (C) Jan de Vaan 2007-2010, all rights reserved. See the accompanying "License.txt" for licensed use. -// +// +// (C) Jan de Vaan 2007-2010, all rights reserved. See the accompanying "License.txt" for licensed use. +// #include "config.h" #include "util.h" #include "streams.h" #include "header.h" - + #include "decodstr.h" #include "encodstr.h" #include "context.h" @@ -16,10 +16,10 @@ signed char* JlsContext::_tableC = CreateTableC(); -// As defined in the JPEG-LS standard +// As defined in the JPEG-LS standard -// used to determine how large runs should be encoded at a time. -const int J[32] = {0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 10, 11, 12, 13, 14, 15}; +// used to determine how large runs should be encoded at a time. +const int J[32] = {0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 10, 11, 12, 13, 14, 15}; @@ -30,32 +30,32 @@ const int J[32] = {0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, signed char QuantizeGratientOrg(const JlsCustomParameters& preset, LONG NEAR, LONG Di) { - if (Di <= -preset.T3) return -4; - if (Di <= -preset.T2) return -3; - if (Di <= -preset.T1) return -2; - if (Di < -NEAR) return -1; - if (Di <= NEAR) return 0; - if (Di < preset.T1) return 1; - if (Di < preset.T2) return 2; - if (Di < preset.T3) return 3; - - return 4; + if (Di <= -preset.T3) return -4; + if (Di <= -preset.T2) return -3; + if (Di <= -preset.T1) return -2; + if (Di < -NEAR) return -1; + if (Di <= NEAR) return 0; + if (Di < preset.T1) return 1; + if (Di < preset.T2) return 2; + if (Di < preset.T3) return 3; + + return 4; } OFVector CreateQLutLossless(LONG cbit) { - JlsCustomParameters preset = ComputeDefault((1 << cbit) - 1, 0); - LONG range = preset.MAXVAL + 1; - - OFVector lut(range * 2); - - for (LONG diff = -range; diff < range; diff++) - { - lut[range + diff] = QuantizeGratientOrg(preset, 0,diff); - } - return lut; + JlsCustomParameters preset = ComputeDefault((1 << cbit) - 1, 0); + LONG range = preset.MAXVAL + 1; + + OFVector lut(range * 2); + + for (LONG diff = -range; diff < range; diff++) + { + lut[range + diff] = QuantizeGratientOrg(preset, 0,diff); + } + return lut; } // Lookup tables to replace code with lookup tables. @@ -63,13 +63,13 @@ OFVector CreateQLutLossless(LONG cbit) // Lookup table: decode symbols that are smaller or equal to 8 bit (16 tables for each value of k) -CTable decodingTables[16] = { InitTable(0), InitTable(1), InitTable(2), InitTable(3), - InitTable(4), InitTable(5), InitTable(6), InitTable(7), - InitTable(8), InitTable(9), InitTable(10), InitTable(11), - InitTable(12), InitTable(13), InitTable(14),InitTable(15) }; +CTable decodingTables[16] = { InitTable(0), InitTable(1), InitTable(2), InitTable(3), + InitTable(4), InitTable(5), InitTable(6), InitTable(7), + InitTable(8), InitTable(9), InitTable(10), InitTable(11), + InitTable(12), InitTable(13), InitTable(14),InitTable(15) }; -// Lookup tables: sample differences to bin indexes. +// Lookup tables: sample differences to bin indexes. OFVector rgquant8Ll = CreateQLutLossless(8); OFVector rgquant10Ll = CreateQLutLossless(10); OFVector rgquant12Ll = CreateQLutLossless(12); @@ -81,24 +81,34 @@ OFVector rgquant16Ll = CreateQLutLossless(16); template OFrvalue > JlsCodecFactory::GetCodec(const JlsParameters& info, const JlsCustomParameters& presets) { - STRATEGY* pstrategy = NULL; - if (presets.RESET != 0 && presets.RESET != BASIC_RESET) - { - DefaultTraitsT traits((1 << info.bitspersample) - 1, info.allowedlossyerror); - traits.MAXVAL = presets.MAXVAL; - traits.RESET = presets.RESET; - pstrategy = new JlsCodec, STRATEGY>(traits, info); - } - else - { - pstrategy = GetCodecImpl(info); - } - - if (pstrategy != NULL) - { - pstrategy->SetPresets(presets); - } - return OFrvalue >(pstrategy); + STRATEGY* pstrategy = NULL; + if (presets.RESET != 0 && presets.RESET != BASIC_RESET) + { + if (info.bitspersample <= 8) + { + DefaultTraitsT traits((1 << info.bitspersample) - 1, info.allowedlossyerror); + traits.MAXVAL = presets.MAXVAL; + traits.RESET = presets.RESET; + pstrategy = new JlsCodec, STRATEGY>(traits, info); + } + else + { + DefaultTraitsT traits((1 << info.bitspersample) - 1, info.allowedlossyerror); + traits.MAXVAL = presets.MAXVAL; + traits.RESET = presets.RESET; + pstrategy = new JlsCodec, STRATEGY>(traits, info); + } + } + else + { + pstrategy = GetCodecImpl(info); + } + + if (pstrategy != NULL) + { + pstrategy->SetPresets(presets); + } + return OFrvalue >(pstrategy); } @@ -106,58 +116,58 @@ OFrvalue > JlsCodecFactory::GetCodec(const JlsP template STRATEGY* CreateCodec(const TRAITS& t, const STRATEGY*,const JlsParameters& info) { - return new JlsCodec(t, info); + return new JlsCodec(t, info); } template STRATEGY* JlsCodecFactory::GetCodecImpl(const JlsParameters& info) -{ - STRATEGY* s = 0; +{ + STRATEGY* s = 0; - if (info.ilv == ILV_SAMPLE && info.components != 3) - return NULL; + if (info.ilv == ILV_SAMPLE && info.components != 3) + return NULL; #ifndef DISABLE_SPECIALIZATIONS - // optimized lossless versions common formats - if (info.allowedlossyerror == 0) - { - if (info.ilv == ILV_SAMPLE) - { - if (info.bitspersample == 8) - return CreateCodec(LosslessTraitsT,8>(), s, info); - } - else - { - switch (info.bitspersample) - { - case 8: return CreateCodec(LosslessTraitsT(), s, info); - case 12: return CreateCodec(LosslessTraitsT(), s, info); - case 16: return CreateCodec(LosslessTraitsT(), s, info); - } - } - } + // optimized lossless versions common formats + if (info.allowedlossyerror == 0) + { + if (info.ilv == ILV_SAMPLE) + { + if (info.bitspersample == 8) + return CreateCodec(LosslessTraitsT,8>(), s, info); + } + else + { + switch (info.bitspersample) + { + case 8: return CreateCodec(LosslessTraitsT(), s, info); + case 12: return CreateCodec(LosslessTraitsT(), s, info); + case 16: return CreateCodec(LosslessTraitsT(), s, info); + } + } + } #endif - int maxval = (1 << info.bitspersample) - 1; - - if (info.bitspersample <= 8) - { - if (info.ilv == ILV_SAMPLE) - return CreateCodec(DefaultTraitsT >(maxval, info.allowedlossyerror), s, info); - - return CreateCodec(DefaultTraitsT((1 << info.bitspersample) - 1, info.allowedlossyerror), s, info); - } - else if (info.bitspersample <= 16) - { - if (info.ilv == ILV_SAMPLE) - return CreateCodec(DefaultTraitsT >(maxval, info.allowedlossyerror), s, info); - - return CreateCodec(DefaultTraitsT(maxval, info.allowedlossyerror), s, info); - } - return NULL; + int maxval = (1 << info.bitspersample) - 1; + + if (info.bitspersample <= 8) + { + if (info.ilv == ILV_SAMPLE) + return CreateCodec(DefaultTraitsT >(maxval, info.allowedlossyerror), s, info); + + return CreateCodec(DefaultTraitsT((1 << info.bitspersample) - 1, info.allowedlossyerror), s, info); + } + else if (info.bitspersample <= 16) + { + if (info.ilv == ILV_SAMPLE) + return CreateCodec(DefaultTraitsT >(maxval, info.allowedlossyerror), s, info); + + return CreateCodec(DefaultTraitsT(maxval, info.allowedlossyerror), s, info); + } + return NULL; } diff --git a/dcmjpls/libsrc/Makefile.dep b/dcmjpls/libsrc/Makefile.dep index 64380e18..82d77df9 100644 --- a/dcmjpls/libsrc/Makefile.dep +++ b/dcmjpls/libsrc/Makefile.dep @@ -35,23 +35,18 @@ djcodecd.o: djcodecd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmjpls/dldefine.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmjpls/dldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ @@ -111,24 +106,19 @@ djcodece.o: djcodece.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \ ../include/dcmtk/dcmjpls/dldefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -216,23 +206,17 @@ djcparam.o: djcparam.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../include/dcmtk/dcmjpls/djlsutil.h ../include/dcmtk/dcmjpls/dldefine.h + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmjpls/djlsutil.h ../include/dcmtk/dcmjpls/dldefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h djdecode.o: djdecode.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmjpls/djdecode.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -269,18 +253,6 @@ djdecode.o: djdecode.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmjpls/dldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dccodec.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ @@ -288,6 +260,8 @@ djdecode.o: djdecode.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpls/djcparam.h ../include/dcmtk/dcmjpls/djcodecd.h djencode.o: djencode.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmjpls/djencode.h \ @@ -325,18 +299,6 @@ djencode.o: djencode.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmjpls/dldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -345,6 +307,8 @@ djencode.o: djencode.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../include/dcmtk/dcmjpls/djcodece.h \ ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h djrparam.o: djrparam.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -393,22 +357,16 @@ djrparam.o: djrparam.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ - ../include/dcmtk/dcmjpls/dldefine.h + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmjpls/dldefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h djutils.o: djutils.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmjpls/djlsutil.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ @@ -444,18 +402,6 @@ djutils.o: djutils.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmjpls/dldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h diff --git a/dcmjpls/libsrc/djcodecd.cc b/dcmjpls/libsrc/djcodecd.cc index 3f0d85e1..4b3b2390 100644 --- a/dcmjpls/libsrc/djcodecd.cc +++ b/dcmjpls/libsrc/djcodecd.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2018, OFFIS e.V. + * Copyright (C) 2007-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -94,6 +94,7 @@ OFCondition DJLSDecoderBase::decode( // determine properties of uncompressed dataset Uint16 imageSamplesPerPixel = 0; if (dataset->findAndGetUint16(DCM_SamplesPerPixel, imageSamplesPerPixel).bad()) return EC_TagNotFound; + // we only handle one or three samples per pixel if ((imageSamplesPerPixel != 3) && (imageSamplesPerPixel != 1)) return EC_InvalidTag; @@ -156,6 +157,7 @@ OFCondition DJLSDecoderBase::decode( Sint32 currentFrame = 0; Uint32 currentItem = 1; // item 0 contains the offset table OFBool done = OFFalse; + OFBool forceSingleFragmentPerFrame = djcp->getForceSingleFragmentPerFrame(); while (result.good() && !done) { @@ -164,6 +166,16 @@ OFCondition DJLSDecoderBase::decode( result = decodeFrame(pixSeq, djcp, dataset, currentFrame, currentItem, pixeldata8, frameSize, imageFrames, imageColumns, imageRows, imageSamplesPerPixel, bytesPerSample); + // check if we should enforce "one fragment per frame" while + // decompressing a multi-frame image even if stream suspension occurs + if ((result == EC_JLSInvalidCompressedData) && forceSingleFragmentPerFrame) + { + // frame is incomplete. Nevertheless skip to next frame. + // This permits decompression of faulty multi-frame images. + DCMJPLS_WARN("JPEG-LS bitstream invalid or incomplete, ignoring (but image is likely to be incomplete)."); + result = EC_Normal; + } + if (result.good()) { // increment frame number, check if we're finished @@ -439,6 +451,12 @@ OFCondition DJLSDecoderBase::decodeFrame( bufSize, sizeof(Uint16)); } } + + // update planar configuration if we are decoding a color image + if (result.good() && (imageSamplesPerPixel > 1)) + { + dataset->putAndInsertUint16(DCM_PlanarConfiguration, imagePlanarConfiguration); + } } } diff --git a/dcmjpls/libsrc/djcodece.cc b/dcmjpls/libsrc/djcodece.cc index 34eb8102..1370fee7 100644 --- a/dcmjpls/libsrc/djcodece.cc +++ b/dcmjpls/libsrc/djcodece.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2018, OFFIS e.V. + * Copyright (C) 2007-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -534,6 +534,20 @@ OFCondition DJLSEncoderBase::losslessRawEncode( result = offsetTable->createOffsetTable(offsetList); } + // adjust planar configuration + if (result.good()) + { + if (photometricInterpretation == "RGB" || photometricInterpretation == "YBR_FULL") + { + // CP 1843 requires a planar configuration value of 0 for these color models + result = dataset->putAndInsertUint16(DCM_PlanarConfiguration, 0); + } + else if (samplesPerPixel == 1) + { + delete dataset->remove(DCM_PlanarConfiguration); + } + } + if (compressedSize > 0) compressionRatio = uncompressedSize / compressedSize; // byte swap pixel data back to local endian if necessary @@ -545,6 +559,68 @@ OFCondition DJLSEncoderBase::losslessRawEncode( return result; } +// static helper functions for DJLSEncoderBase::setCustomParameters(). +static long setcp_clamp(long i, long j, long MAXVAL) +{ + if (i > MAXVAL || i < j) + return j; + + return i; +} + +long setcp_min(long a, long b) +{ + return (((a) < (b)) ? (a) : (b)); +} + +void DJLSEncoderBase::setCustomParameters( + JlsCustomParameters& custom, + Uint16 bitsAllocated, + Uint16 nearLosslessDeviation, + const DJLSCodecParameter *djcp) +{ + // first check if all parameters are set to default (which will be the most common case). + // In this case we will set everything in the custom struct to zero as well. + if ((djcp->getT1() == 0) && (djcp->getT2() == 0) && (djcp->getT3() == 0) && (djcp->getReset() == 0)) + { + custom.T1 = 0; + custom.T2 = 0; + custom.T3 = 0; + custom.RESET = 0; + custom.MAXVAL = 0; + return; + } + + // unfortunately, CharLS either takes all or none of the parameters + // in the "custom" struct. So if we change any of them, we need to provide + // legal values for all of them. The function in CharLS that computes these + // values is not public, so we basically have to re-implement it here. + + const int BASIC_T1 = 3; + const int BASIC_T2 = 7; + const int BASIC_T3 = 21; + const long BASIC_RESET = 64; + + long MAXVAL = (1 << bitsAllocated) - 1; + long FACTOR = (setcp_min(MAXVAL, 4095) + 128)/256; + long NEAR = nearLosslessDeviation; + + custom.MAXVAL = MAXVAL; + + if (djcp->getT1() > 0) custom.T1 = djcp->getT1(); else + custom.T1 = setcp_clamp(FACTOR * (BASIC_T1 - 2) + 2 + 3*NEAR, NEAR + 1, MAXVAL); + + if (djcp->getT2() > 0) custom.T2 = djcp->getT2(); else + custom.T2 = setcp_clamp(FACTOR * (BASIC_T2 - 3) + 3 + 5*NEAR, custom.T1, MAXVAL); + + if (djcp->getT3() > 0) custom.T3 = djcp->getT3(); else + custom.T3 = setcp_clamp(FACTOR * (BASIC_T3 - 4) + 4 + 7*NEAR, custom.T2, MAXVAL); + + if (djcp->getReset() > 0) custom.RESET = djcp->getReset(); + else custom.RESET = BASIC_RESET; + +} + OFCondition DJLSEncoderBase::compressRawFrame( const Uint8 *framePointer, Uint16 bitsAllocated, @@ -562,7 +638,6 @@ OFCondition DJLSEncoderBase::compressRawFrame( Uint16 bytesAllocated = bitsAllocated / 8; Uint32 frameSize = width*height*bytesAllocated*samplesPerPixel; Uint32 fragmentSize = djcp->getFragmentSize(); - OFBool opt_use_custom_options = djcp->getUseCustomOptions(); JlsParameters jls_params; Uint8 *frameBuffer = NULL; @@ -575,19 +650,11 @@ OFCondition DJLSEncoderBase::compressRawFrame( jls_params.outputBgr = false; // No idea what this one does, but I don't think DICOM says anything about it jls_params.colorTransform = 0; - // Unset: jls_params.jfif (thumbnail, dpi) - if (opt_use_custom_options) - { - jls_params.custom.T1 = djcp->getT1(); - jls_params.custom.T2 = djcp->getT2(); - jls_params.custom.T3 = djcp->getT3(); - jls_params.custom.RESET = djcp->getReset(); - // not set: jls_params.custom.MAXVAL - // MAXVAL is the maximum sample value in the image, it helps the compression - // if it's used (I think...) - } + // set parameters T1, T2, T3, MAXVAL and RESET. + // compressRawFrame() is only used for true lossless mode, so the near-lossless deviation is always 0 here. + setCustomParameters(jls_params.custom, bitsAllocated, 0, djcp); // Theoretically we could support any samplesPerPixel value, but for now we // only accept these (charls is a little picky for other values). @@ -670,7 +737,7 @@ OFCondition DJLSEncoderBase::compressRawFrame( if (result.good()) { compressedSize = OFstatic_cast(unsigned long, bytesWritten); - fixPaddingIfNecessary(OFstatic_cast(Uint8 *, buffer), size, compressedSize); + fixPaddingIfNecessary(OFstatic_cast(Uint8 *, buffer), size, compressedSize, djcp->getUseFFbitstreamPadding()); result = pixelSequence->storeCompressedFrame(offsetList, buffer, compressedSize, fragmentSize); } @@ -841,6 +908,20 @@ OFCondition DJLSEncoderBase::losslessCookedEncode( result = dataset->putAndInsertUint16(DCM_BitsAllocated, 8); if (result.good()) result = dataset->putAndInsertUint16(DCM_BitsStored, bitsPerSample); if (result.good()) result = dataset->putAndInsertUint16(DCM_HighBit, bitsPerSample-1); + if (result.good()) + { + if (photometricInterpretation == "RGB" || photometricInterpretation == "YBR_FULL") + { + // CP 1843 requires a planar configuration value of 0 for these color models + result = dataset->putAndInsertUint16(DCM_PlanarConfiguration, 0); + } + else + { + // this is monochrome since we have ruled out all other photometric interpretations + // at the start of this method + delete dataset->remove(DCM_PlanarConfiguration); + } + } } if (compressedSize > 0) compressionRatio = uncompressedSize / compressedSize; @@ -868,7 +949,6 @@ OFCondition DJLSEncoderBase::compressCookedFrame( if ((depth < 1) || (depth > 16)) return EC_JLSUnsupportedBitDepth; Uint32 fragmentSize = djcp->getFragmentSize(); - OFBool opt_use_custom_options = djcp->getUseCustomOptions(); const DiPixel *dinter = dimage->getInterData(); if (dinter == NULL) return EC_IllegalCall; @@ -1005,30 +1085,11 @@ OFCondition DJLSEncoderBase::compressCookedFrame( // This was already checked for a sane value above jls_params.components = samplesPerPixel; - switch(dinter->getRepresentation()) - { - case EPR_Uint8: - case EPR_Sint8: - jls_params.bitspersample = 8; - break; - case EPR_Uint16: - case EPR_Sint16: - jls_params.bitspersample = 16; - break; - default: - // Everything else was already handled above and can't happen here - break; - } // Unset: jls_params.jfif (thumbnail, dpi) - if (opt_use_custom_options) - { - jls_params.custom.T1 = djcp->getT1(); - jls_params.custom.T2 = djcp->getT2(); - jls_params.custom.T3 = djcp->getT3(); - jls_params.custom.RESET = djcp->getReset(); - } + // set parameters T1, T2, T3, MAXVAL and RESET + setCustomParameters(jls_params.custom, depth, nearLosslessDeviation, djcp); switch (djcp->getJplsInterleaveMode()) { @@ -1078,7 +1139,7 @@ OFCondition DJLSEncoderBase::compressCookedFrame( { // 'compressed_buffer_size' now contains the size of the compressed data in buffer compressedSize = OFstatic_cast(unsigned long, bytesWritten); - fixPaddingIfNecessary(OFstatic_cast(Uint8 *, buffer), compressed_buffer_size, compressedSize); + fixPaddingIfNecessary(OFstatic_cast(Uint8 *, buffer), compressed_buffer_size, compressedSize, djcp->getUseFFbitstreamPadding()); result = pixelSequence->storeCompressedFrame(offsetList, compressed_buffer, compressedSize, fragmentSize); } @@ -1143,7 +1204,8 @@ OFCondition DJLSEncoderBase::convertToSampleInterleaved( void DJLSEncoderBase::fixPaddingIfNecessary( Uint8 *buffer, size_t bufSize, - unsigned long &bytesWritten) + unsigned long &bytesWritten, + OFBool useFFpadding) { // check if an odd number of bytes was written and the buffer // has space for the needed pad byte (which should in practice @@ -1153,18 +1215,20 @@ void DJLSEncoderBase::fixPaddingIfNecessary( // first write a zero pad byte after the end of the JPEG-LS bitstream buffer[bytesWritten++] = 0; -#ifndef DISABLE_FF_JPEG_BITSTREAM_PADDING - // look for the EOI marker - if ((bytesWritten > 2) && (buffer[bytesWritten-3] == 0xFF) && (buffer[bytesWritten-2] == 0xD9)) + // check if we are expected to use an extended EOI marker for padding + if (useFFpadding) { - // we now have ff/d9/00 at the end of the JPEG bitstream, - // i.e. an end of image (EOI) marker followed by a pad byte. - // Replace this with ff/ff/d9, which is an "extended" EOI marker - // ending on an even byte boundary. - buffer[bytesWritten-2] = 0xFF; - buffer[bytesWritten-1] = 0xD9; + // look for the EOI marker + if ((bytesWritten > 2) && (buffer[bytesWritten-3] == 0xFF) && (buffer[bytesWritten-2] == 0xD9)) + { + // we now have ff/d9/00 at the end of the JPEG bitstream, + // i.e. an end of image (EOI) marker followed by a pad byte. + // Replace this with ff/ff/d9, which is an "extended" EOI marker + // ending on an even byte boundary. + buffer[bytesWritten-2] = 0xFF; + buffer[bytesWritten-1] = 0xD9; + } } } -#endif return; } diff --git a/dcmjpls/libsrc/djcparam.cc b/dcmjpls/libsrc/djcparam.cc index 58e0ef7b..cbaafa7e 100644 --- a/dcmjpls/libsrc/djcparam.cc +++ b/dcmjpls/libsrc/djcparam.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2011, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -24,35 +24,34 @@ #include "dcmtk/ofstd/ofstd.h" DJLSCodecParameter::DJLSCodecParameter( - OFBool jpls_optionsEnabled, - Uint16 jpls_t1, // these are the defaults for 8bpp in lossless mode + OFBool preferCookedEncoding, + Uint16 jpls_t1, Uint16 jpls_t2, Uint16 jpls_t3, Uint16 jpls_reset, - Uint16 jpls_limit, - OFBool preferCookedEncoding, Uint32 fragmentSize, OFBool createOffsetTable, JLS_UIDCreation uidCreation, OFBool convertToSC, JLS_PlanarConfiguration planarConfiguration, OFBool ignoreOffsetTble, - interleaveMode jplsInterleaveMode) + interleaveMode jplsInterleaveMode, + OFBool useFFbitstreamPadding) : DcmCodecParameter() -, jpls_optionsEnabled_(jpls_optionsEnabled) +, preferCookedEncoding_(preferCookedEncoding) , jpls_t1_(jpls_t1) , jpls_t2_(jpls_t2) , jpls_t3_(jpls_t3) , jpls_reset_(jpls_reset) -, jpls_limit_(jpls_limit) , fragmentSize_(fragmentSize) , createOffsetTable_(createOffsetTable) -, preferCookedEncoding_(preferCookedEncoding) , uidCreation_(uidCreation) , convertToSC_(convertToSC) , jplsInterleaveMode_(jplsInterleaveMode) +, useFFbitstreamPadding_(useFFbitstreamPadding) , planarConfiguration_(planarConfiguration) , ignoreOffsetTable_(ignoreOffsetTble) +, forceSingleFragmentPerFrame_(OFFalse) { } @@ -60,42 +59,42 @@ DJLSCodecParameter::DJLSCodecParameter( DJLSCodecParameter::DJLSCodecParameter( JLS_UIDCreation uidCreation, JLS_PlanarConfiguration planarConfiguration, - OFBool ignoreOffsetTble) + OFBool ignoreOffsetTble, + OFBool forceSingleFragmentPerFrame) : DcmCodecParameter() -, jpls_optionsEnabled_(OFFalse) -, jpls_t1_(3) -, jpls_t2_(7) -, jpls_t3_(21) -, jpls_reset_(64) -, jpls_limit_(0) +, preferCookedEncoding_(OFTrue) +, jpls_t1_(0) +, jpls_t2_(0) +, jpls_t3_(0) +, jpls_reset_(0) , fragmentSize_(0) , createOffsetTable_(OFTrue) -, preferCookedEncoding_(OFTrue) , uidCreation_(uidCreation) , convertToSC_(OFFalse) , jplsInterleaveMode_(interleaveDefault) +, useFFbitstreamPadding_(OFTrue) , planarConfiguration_(planarConfiguration) , ignoreOffsetTable_(ignoreOffsetTble) +, forceSingleFragmentPerFrame_(forceSingleFragmentPerFrame) { } DJLSCodecParameter::DJLSCodecParameter(const DJLSCodecParameter& arg) : DcmCodecParameter(arg) - -, jpls_optionsEnabled_(arg.jpls_optionsEnabled_) +, preferCookedEncoding_(arg.preferCookedEncoding_) , jpls_t1_(arg.jpls_t1_) , jpls_t2_(arg.jpls_t2_) , jpls_t3_(arg.jpls_t3_) , jpls_reset_(arg.jpls_reset_) -, jpls_limit_(arg.jpls_limit_) , fragmentSize_(arg.fragmentSize_) , createOffsetTable_(arg.createOffsetTable_) -, preferCookedEncoding_(arg.preferCookedEncoding_) , uidCreation_(arg.uidCreation_) , convertToSC_(arg.convertToSC_) , jplsInterleaveMode_(arg.jplsInterleaveMode_) +, useFFbitstreamPadding_(arg.useFFbitstreamPadding_) , planarConfiguration_(arg.planarConfiguration_) , ignoreOffsetTable_(arg.ignoreOffsetTable_) +, forceSingleFragmentPerFrame_(arg.forceSingleFragmentPerFrame_) { } diff --git a/dcmjpls/libsrc/djdecode.cc b/dcmjpls/libsrc/djdecode.cc index 56996e10..e6559a88 100644 --- a/dcmjpls/libsrc/djdecode.cc +++ b/dcmjpls/libsrc/djdecode.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2011, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -34,11 +34,12 @@ DJLSNearLosslessDecoder *DJLSDecoderRegistration::nearlosslessdecoder_ = NULL; void DJLSDecoderRegistration::registerCodecs( JLS_UIDCreation uidcreation, JLS_PlanarConfiguration planarconfig, - OFBool ignoreOffsetTable) + OFBool ignoreOffsetTable, + OFBool forceSingleFragmentPerFrame) { if (! registered_) { - cp_ = new DJLSCodecParameter(uidcreation, planarconfig, ignoreOffsetTable); + cp_ = new DJLSCodecParameter(uidcreation, planarconfig, ignoreOffsetTable, forceSingleFragmentPerFrame); if (cp_) { losslessdecoder_ = new DJLSLosslessDecoder(); diff --git a/dcmjpls/libsrc/djencode.cc b/dcmjpls/libsrc/djencode.cc index e133bb3b..2ac87eac 100644 --- a/dcmjpls/libsrc/djencode.cc +++ b/dcmjpls/libsrc/djencode.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2011, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -33,24 +33,23 @@ DJLSNearLosslessEncoder *DJLSEncoderRegistration::nearlosslessencoder_ = NULL; void DJLSEncoderRegistration::registerCodecs( - OFBool jpls_optionsEnabled, Uint16 jpls_t1, Uint16 jpls_t2, Uint16 jpls_t3, Uint16 jpls_reset, - Uint16 jpls_limit, OFBool preferCookedEncoding, Uint32 fragmentSize, OFBool createOffsetTable, JLS_UIDCreation uidCreation, OFBool convertToSC, - DJLSCodecParameter::interleaveMode jplsInterleaveMode) + DJLSCodecParameter::interleaveMode jplsInterleaveMode, + OFBool useFFbitstreamPadding) { if (! registered_) { - cp_ = new DJLSCodecParameter(jpls_optionsEnabled, jpls_t1, jpls_t2, jpls_t3, jpls_reset, - jpls_limit, preferCookedEncoding, fragmentSize, createOffsetTable, uidCreation, - convertToSC, EJLSPC_restore, OFFalse, jplsInterleaveMode); + cp_ = new DJLSCodecParameter(preferCookedEncoding, jpls_t1, jpls_t2, jpls_t3, + jpls_reset, fragmentSize, createOffsetTable, uidCreation, + convertToSC, EJLSPC_restore, OFFalse, jplsInterleaveMode, useFFbitstreamPadding); if (cp_) { diff --git a/dcmnet/apps/Makefile.dep b/dcmnet/apps/Makefile.dep index ae77c5cd..4f10a025 100644 --- a/dcmnet/apps/Makefile.dep +++ b/dcmnet/apps/Makefile.dep @@ -111,11 +111,14 @@ dcmrecv.o: dcmrecv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dicom.h \ ../include/dcmtk/dcmnet/cond.h ../include/dcmtk/dcmnet/dndefine.h \ ../include/dcmtk/dcmnet/dcompat.h \ @@ -241,11 +244,14 @@ dcmsend.o: dcmsend.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dimse.h \ @@ -311,23 +317,18 @@ echoscu.o: echoscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -344,6 +345,10 @@ echoscu.o: echoscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmtls/include/dcmtk/dcmtls/tlsopt.h \ ../../dcmtls/include/dcmtk/dcmtls/tlslayer.h \ ../../dcmtls/include/dcmtk/dcmtls/tlsdefin.h \ @@ -385,32 +390,28 @@ findscu.o: findscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmnet/dimse.h ../include/dcmtk/dcmnet/dicom.h \ ../include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ - ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/assoc.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../include/dcmtk/dcmnet/extneg.h \ + ../include/dcmtk/dcmnet/dcuserid.h ../include/dcmtk/dcmnet/dntypes.h \ + ../include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -419,6 +420,10 @@ findscu.o: findscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrmz.h \ @@ -539,11 +544,14 @@ getscu.o: getscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ diff --git a/dcmnet/apps/findscu.cc b/dcmnet/apps/findscu.cc index 6194803d..fcd9e965 100644 --- a/dcmnet/apps/findscu.cc +++ b/dcmnet/apps/findscu.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -443,9 +443,15 @@ int main(int argc, char *argv[]) opt_outputDirectory.c_str(), opt_extractXMLFilename.c_str()); + // make sure that an appropriate exit code is returned + int exitCode = cond.good() ? 0 : 2; + // destroy network structure cond = findscu.dropNetwork(); - if (cond.bad()) OFLOG_ERROR(findscuLogger, DimseCondition::dump(temp_str, cond)); + if (cond.bad()) { + OFLOG_ERROR(findscuLogger, DimseCondition::dump(temp_str, cond)); + if (!exitCode) exitCode = 3; + } OFStandard::shutdownNetwork(); @@ -455,5 +461,5 @@ int main(int argc, char *argv[]) OFLOG_WARN(findscuLogger, DimseCondition::dump(temp_str, cond)); } - return 0; + return exitCode; } diff --git a/dcmnet/apps/getscu.cc b/dcmnet/apps/getscu.cc index 533d004a..55f2486b 100644 --- a/dcmnet/apps/getscu.cc +++ b/dcmnet/apps/getscu.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011-2017, OFFIS e.V. + * Copyright (C) 2011-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -406,7 +406,7 @@ main(int argc, char *argv[]) cond = scu.negotiateAssociation(); if (cond.bad()) { - OFLOG_FATAL(getscuLogger, "No Acceptable Presentation Contexts"); + OFLOG_FATAL(getscuLogger, "Could not negotiate association: " << cond.text()); exit(1); } cond = EC_Normal; diff --git a/dcmnet/apps/storescp.cc b/dcmnet/apps/storescp.cc index d818e524..db289225 100644 --- a/dcmnet/apps/storescp.cc +++ b/dcmnet/apps/storescp.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -2392,7 +2392,7 @@ static void executeCommand( const OFString &cmd ) // we 'emulate' a call to system() by passing the command to /bin/sh // which hopefully exists on all Posix systems. - if (execl( "/bin/sh", "/bin/sh", "-c", cmd.c_str(), NULL ) < 0) + if (execl( "/bin/sh", "/bin/sh", "-c", cmd.c_str(), OFreinterpret_cast(char *, 0) ) < 0) OFLOG_ERROR(storescpLogger, "cannot execute /bin/sh"); // if execl succeeds, this part will not get executed. diff --git a/dcmnet/apps/storescu.cc b/dcmnet/apps/storescu.cc index 9e38e178..2830a450 100644 --- a/dcmnet/apps/storescu.cc +++ b/dcmnet/apps/storescu.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2018, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -52,7 +52,7 @@ END_EXTERN_C #include "dcmtk/dcmdata/cmdlnarg.h" #include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */ #include "dcmtk/dcmdata/dcostrmz.h" /* for dcmZlibCompressionLevel */ -#include "dcmtk/dcmtls/tlsopt.h" /* for DcmTLSOptions */ +#include "dcmtk/dcmtls/tlsopt.h" /* for DcmTLSOptions */ #ifdef ON_THE_FLY_COMPRESSION #include "dcmtk/dcmjpeg/djdecode.h" /* for JPEG decoders */ @@ -92,6 +92,7 @@ static E_FileReadMode opt_readMode = ERM_autoDetect; static OFBool opt_scanDir = OFFalse; static OFBool opt_recurse = OFFalse; +static OFBool opt_renameFile = OFFalse; static const char *opt_scanPattern = ""; static OFBool opt_haltOnUnsuccessfulStore = OFTrue; @@ -213,6 +214,8 @@ int main(int argc, char *argv[]) #endif cmd.addOption("--no-recurse", "-r", "do not recurse within directories (default)"); cmd.addOption("--recurse", "+r", "recurse within specified directories"); + cmd.addOption("--no-rename", "-rn", "do not rename processed files (default)"); + cmd.addOption("--rename", "+rn", "append .done/.bad to processed files"); cmd.addGroup("network options:"); cmd.addSubGroup("application entity titles:"); cmd.addOption("--aetitle", "-aet", 1, "[a]etitle: string", "set my calling AE title (default: " APPLICATIONTITLE ")"); @@ -366,6 +369,11 @@ int main(int argc, char *argv[]) } cmd.endOptionBlock(); + cmd.beginOptionBlock(); + if (cmd.findOption("--no-rename")) opt_renameFile = OFFalse; + if (cmd.findOption("--rename")) opt_renameFile = OFTrue; + cmd.endOptionBlock(); + if (cmd.findOption("--aetitle")) app.checkValue(cmd.getValue(opt_ourTitle)); if (cmd.findOption("--call")) app.checkValue(cmd.getValue(opt_peerTitle)); @@ -695,7 +703,7 @@ int main(int argc, char *argv[]) return 1; } - /* initialize asscociation parameters, i.e. create an instance of T_ASC_Parameters*. */ + /* initialize association parameters, i.e. create an instance of T_ASC_Parameters*. */ cond = ASC_createAssociationParameters(¶ms, opt_maxReceivePDULength); if (cond.bad()) { OFLOG_FATAL(storescuLogger, DimseCondition::dump(temp_str, cond)); @@ -973,7 +981,7 @@ addStoragePresentationContexts(T_ASC_Parameters *params, * Each SOP Class will be proposed in two presentation contexts (unless * the opt_combineProposedTransferSyntaxes global variable is true). * The command line specified a preferred transfer syntax to use. - * This prefered transfer syntax will be proposed in one + * This preferred transfer syntax will be proposed in one * presentation context and a set of alternative (fallback) transfer * syntaxes will be proposed in a different presentation context. * @@ -1253,6 +1261,18 @@ progressCallback(void * /*callbackData*/, } } +static void +renameFile(const char *fname, const char *fext) +{ + if (!opt_renameFile) return; + OFString fnewname(fname); + fnewname += fext; + if (OFStandard::renameFile(fname, fnewname)) + OFLOG_DEBUG(storescuLogger, "renamed file '" << fname << "' to '" << fnewname << "'"); + else + OFLOG_WARN(storescuLogger, "cannot rename file '" << fname << "' to '" << fnewname << "'"); +} + static OFCondition storeSCU(T_ASC_Association *assoc, const char *fname) /* @@ -1285,9 +1305,11 @@ storeSCU(T_ASC_Association *assoc, const char *fname) DcmFileFormat dcmff; OFCondition cond = dcmff.loadFile(fname, EXS_Unknown, EGL_noChange, DCM_MaxReadLength, opt_readMode); - /* figure out if an error occured while the file was read*/ - if (cond.bad()) { + /* figure out if an error occurred while the file was read */ + if (cond.bad()) + { OFLOG_ERROR(storescuLogger, "Bad DICOM file: " << fname << ": " << cond.text()); + renameFile(fname, ".bad"); return cond; } @@ -1298,9 +1320,11 @@ storeSCU(T_ASC_Association *assoc, const char *fname) /* figure out which SOP class and SOP instance is encapsulated in the file */ if (!DU_findSOPClassAndInstanceInDataSet(dcmff.getDataset(), - sopClass, sizeof(sopClass), sopInstance, sizeof(sopInstance), opt_correctUIDPadding)) { - OFLOG_ERROR(storescuLogger, "No SOP Class or Instance UID in file: " << fname); - return DIMSE_BADDATA; + sopClass, sizeof(sopClass), sopInstance, sizeof(sopInstance), opt_correctUIDPadding)) + { + OFLOG_ERROR(storescuLogger, "No SOP Class or Instance UID in file: " << fname); + renameFile(fname, ".bad"); + return DIMSE_BADDATA; } /* figure out which of the accepted presentation contexts should be used */ @@ -1320,11 +1344,13 @@ storeSCU(T_ASC_Association *assoc, const char *fname) presID = ASC_findAcceptedPresentationContextID(assoc, sopClass, filexfer.getXferID()); else presID = ASC_findAcceptedPresentationContextID(assoc, sopClass); - if (presID == 0) { + if (presID == 0) + { const char *modalityName = dcmSOPClassUIDToModality(sopClass); if (!modalityName) modalityName = dcmFindNameOfUID(sopClass); if (!modalityName) modalityName = "unknown SOP class"; OFLOG_ERROR(storescuLogger, "No presentation context for: (" << modalityName << ") " << sopClass); + renameFile(fname, ".bad"); return DIMSE_NOVALIDPRESENTATIONCONTEXTID; } @@ -1333,7 +1359,8 @@ storeSCU(T_ASC_Association *assoc, const char *fname) DcmXfer netTransfer(pc.acceptedTransferSyntax); /* if required, dump general information concerning transfer syntaxes */ - if (storescuLogger.isEnabledFor(OFLogger::INFO_LOG_LEVEL)) { + if (storescuLogger.isEnabledFor(OFLogger::INFO_LOG_LEVEL)) + { DcmXfer fileTransfer(dcmff.getDataset()->getOriginalXfer()); OFLOG_INFO(storescuLogger, "Converting transfer syntax: " << fileTransfer.getXferName() << " -> " << netTransfer.getXferName()); @@ -1341,8 +1368,10 @@ storeSCU(T_ASC_Association *assoc, const char *fname) #ifdef ON_THE_FLY_COMPRESSION cond = dcmff.getDataset()->chooseRepresentation(netTransfer.getXfer(), NULL); - if (cond.bad()) { + if (cond.bad()) + { OFLOG_ERROR(storescuLogger, "No conversion to transfer syntax " << netTransfer.getXferName() << " possible!"); + renameFile(fname, ".bad"); return cond; } #endif @@ -1369,8 +1398,14 @@ storeSCU(T_ASC_Association *assoc, const char *fname) * If store command completed normally, with a status * of success or some warning then the image was accepted. */ - if (cond == EC_Normal && (rsp.DimseStatus == STATUS_Success || DICOM_WARNING_STATUS(rsp.DimseStatus))) { + if (cond == EC_Normal && (rsp.DimseStatus == STATUS_Success || DICOM_WARNING_STATUS(rsp.DimseStatus))) + { unsuccessfulStoreEncountered = OFFalse; + renameFile(fname, ".done"); + } + else + { + renameFile(fname, ".bad"); } /* remember the response's status for later transmissions of data */ @@ -1420,7 +1455,7 @@ cstore(T_ASC_Association *assoc, const OFString &fname) /* opt_repeatCount specifies how many times a certain file shall be processed */ int n = OFstatic_cast(int, opt_repeatCount); - /* as long as no error occured and the counter does not equal 0 */ + /* as long as no error occurred and the counter does not equal 0 */ while ((cond.good()) && n-- && !(opt_haltOnUnsuccessfulStore && unsuccessfulStoreEncountered)) { /* process file (read file, send C-STORE-RQ, receive C-STORE-RSP) */ diff --git a/dcmnet/docs/echoscu.man b/dcmnet/docs/echoscu.man index 134dce7b..66ef9c22 100644 --- a/dcmnet/docs/echoscu.man +++ b/dcmnet/docs/echoscu.man @@ -147,6 +147,9 @@ security profile: +py --profile-bcp195-nd Non-downgrading BCP 195 TLS Profile + +pz --profile-bcp195-ex + Extended BCP 195 TLS Profile + +pb --profile-basic Basic TLS Secure Transport Connection Profile (retired) diff --git a/dcmnet/docs/findscu.man b/dcmnet/docs/findscu.man index 325b6163..74e9a007 100644 --- a/dcmnet/docs/findscu.man +++ b/dcmnet/docs/findscu.man @@ -195,6 +195,9 @@ security profile: +py --profile-bcp195-nd Non-downgrading BCP 195 TLS Profile + +pz --profile-bcp195-ex + Extended BCP 195 TLS Profile + +pb --profile-basic Basic TLS Secure Transport Connection Profile (retired) @@ -332,7 +335,13 @@ the logger can be enforced with option \e --show-responses. In addition, the response datasets can also be extracted as individual DICOM files (using option \e --extract) or XML files (using option \e --extract-xml). The output format of the latter is described by the file dcm2xml.dtd -(starting with top-level element "data-set"). +(starting with top-level element "data-set"). For XML files, the Specific +Character Set is mapped automatically to an appropriate XML encoding. If this +is not possible, e.g. in case of ISO 2022 character sets, non-ASCII characters +and those below #32 are stored as "&#nnn;" where "nnn" refers to the numeric +character code. Please note that this might lead to invalid character entity +references (such as "" for ESC) and will cause most XML parsers to reject +the document. Alternatively, all response datasets of an association can be extracted to a single XML file using option \e --extract-xml-single. The top-level element of @@ -439,6 +448,6 @@ It is an error if no data dictionary can be loaded. \section findscu_copyright COPYRIGHT -Copyright (C) 1994-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 1994-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmnet/docs/movescu.man b/dcmnet/docs/movescu.man index 8c5557df..5e3d08ad 100644 --- a/dcmnet/docs/movescu.man +++ b/dcmnet/docs/movescu.man @@ -559,6 +559,8 @@ ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88. AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1 EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1 EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2 @@ -578,6 +580,10 @@ RTBrachyTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481 RTTreatmentSummaryRecordStorage 1.2.840.10008.5.1.4.1.1.481.7 RTIonPlanStorage 1.2.840.10008.5.1.4.1.1.481.8 RTIonBeamsTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481.9 +RTPhysicianIntentStorage 1.2.840.10008.5.1.4.1.1.481.10 +RTSegmentAnnotationStorage 1.2.840.10008.5.1.4.1.1.481.11 +RTRadiationSetStorage 1.2.840.10008.5.1.4.1.1.481.12 +CArmPhotonElectronRadiationStorage 1.2.840.10008.5.1.4.1.1.481.13 DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501.1 DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1 DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2 @@ -759,6 +765,6 @@ It is an error if no data dictionary can be loaded. \section movescu_copyright COPYRIGHT -Copyright (C) 1994-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 1994-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmnet/docs/storescp.man b/dcmnet/docs/storescp.man index f27a1fe5..5ae53a20 100644 --- a/dcmnet/docs/storescp.man +++ b/dcmnet/docs/storescp.man @@ -255,6 +255,9 @@ security profile: +py --profile-bcp195-nd Non-downgrading BCP 195 TLS Profile + +pz --profile-bcp195-ex + Extended BCP 195 TLS Profile + +pb --profile-basic Basic TLS Secure Transport Connection Profile (retired) @@ -712,9 +715,12 @@ ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88. AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1 EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1 EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2 +EncapsulatedSTLStorage 1.2.840.10008.5.1.4.1.1.104.3 PositronEmissionTomographyImageStorage 1.2.840.10008.5.1.4.1.1.128 LegacyConvertedEnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.128.1 RETIRED_StandalonePETCurveStorage 1.2.840.10008.5.1.4.1.1.129 @@ -730,6 +736,10 @@ RTBrachyTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481 RTTreatmentSummaryRecordStorage 1.2.840.10008.5.1.4.1.1.481.7 RTIonPlanStorage 1.2.840.10008.5.1.4.1.1.481.8 RTIonBeamsTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481.9 +RTPhysicianIntentStorage 1.2.840.10008.5.1.4.1.1.481.10 +RTSegmentAnnotationStorage 1.2.840.10008.5.1.4.1.1.481.11 +RTRadiationSetStorage 1.2.840.10008.5.1.4.1.1.481.12 +CArmPhotonElectronRadiationStorage 1.2.840.10008.5.1.4.1.1.481.13 DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501.1 DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1 DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2 @@ -902,6 +912,6 @@ It is an error if no data dictionary can be loaded. \section storescp_copyright COPYRIGHT -Copyright (C) 1996-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 1996-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmnet/docs/storescu.man b/dcmnet/docs/storescu.man index 72add6e5..d4a25cf0 100644 --- a/dcmnet/docs/storescu.man +++ b/dcmnet/docs/storescu.man @@ -91,6 +91,12 @@ input files: +r --recurse recurse within specified directories + + -rn --no-rename + do not rename processed files (default) + + +rn --rename + append .done/.bad to processed files \endverbatim \subsection storescu_network_options network options @@ -331,6 +337,9 @@ security profile: +py --profile-bcp195-nd Non-downgrading BCP 195 TLS Profile + +pz --profile-bcp195-ex + Extended BCP 195 TLS Profile + +pb --profile-basic Basic TLS Secure Transport Connection Profile (retired) @@ -571,6 +580,6 @@ It is an error if no data dictionary can be loaded. \section storescu_copyright COPYRIGHT -Copyright (C) 1996-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 1996-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmnet/etc/storescp.cfg b/dcmnet/etc/storescp.cfg index 64309903..6d83ff4e 100644 --- a/dcmnet/etc/storescp.cfg +++ b/dcmnet/etc/storescp.cfg @@ -1,5 +1,5 @@ # -# Copyright (C) 2003-2018, OFFIS e.V. +# Copyright (C) 2003-2019, OFFIS e.V. # All rights reserved. See COPYRIGHT file for details. # # This software and supporting documentation were developed by @@ -207,6 +207,7 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib # - AdvancedBlendingPresentationStateStorage # - BreastProjectionXRayImageStorageForPresentation # - BreastProjectionXRayImageStorageForProcessing +# - CArmPhotonElectronRadiationStorage # - ColorPaletteStorage # - CompositingPlanarMPRVolumetricPresentationStateStorage # - ContentAssessmentResultsStorage @@ -224,9 +225,14 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib # - OphthalmicOpticalCoherenceTomographyEnFaceImageStorage # - ParametricMapStorage # - PatientRadiationDoseSRStorage +# - PerformedImagingAgentAdministrationSRStorage +# - PlannedImagingAgentAdministrationSRStorage # - ProtocolApprovalStorage # - RadiopharmaceuticalRadiationDoseSRStorage # - RTBrachyApplicationSetupDeliveryInstructionStorage +# - RTPhysicianIntentStorage +# - RTRadiationSetStorage +# - RTSegmentAnnotationStorage # - SegmentedVolumeRenderingVolumetricPresentationStateStorage # - SimplifiedAdultEchoSRStorage # - TractographyResultsStorage @@ -392,13 +398,19 @@ PresentationContext128 = XRayRadiationDoseSRStorage\UncompressedOrZlib # the following SOP classes are missing in the above list: # # - AdvancedBlendingPresentationStateStorage +# - CArmPhotonElectronRadiationStorage # - ColorPaletteStorage # - EncapsulatedSTLStorage # - MultipleVolumeRenderingVolumetricPresentationStateStorage # - OphthalmicOpticalCoherenceTomographyBscanVolumeAnalysisStorage # - OphthalmicOpticalCoherenceTomographyEnFaceImageStorage # - PatientRadiationDoseSRStorage +# - PerformedImagingAgentAdministrationSRStorage +# - PlannedImagingAgentAdministrationSRStorage # - ProtocolApprovalStorage +# - RTPhysicianIntentStorage +# - RTRadiationSetStorage +# - RTSegmentAnnotationStorage # - SegmentedVolumeRenderingVolumetricPresentationStateStorage # - VolumeRenderingVolumetricPresentationStateStorage # diff --git a/dcmnet/etc/storescu.cfg b/dcmnet/etc/storescu.cfg index 8d6bc3be..252ff183 100644 --- a/dcmnet/etc/storescu.cfg +++ b/dcmnet/etc/storescu.cfg @@ -1,5 +1,5 @@ # -# Copyright (C) 2003-2018, OFFIS e.V. +# Copyright (C) 2003-2019, OFFIS e.V. # All rights reserved. See COPYRIGHT file for details. # # This software and supporting documentation were developed by @@ -208,6 +208,7 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2 # - BreastProjectionXRayImageStorageForPresentation # - BreastProjectionXRayImageStorageForProcessing # - BreastTomosynthesisImageStorage +# - CArmPhotonElectronRadiationStorage # - CompositingPlanarMPRVolumetricPresentationStateStorage # - Comprehensive3DSRStorage # - ContentAssessmentResultsStorage @@ -245,6 +246,8 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2 # - OphthalmicVisualFieldStaticPerimetryMeasurementsStorage # - ParametricMapStorage # - PatientRadiationDoseSRStorage +# - PerformedImagingAgentAdministrationSRStorage +# - PlannedImagingAgentAdministrationSRStorage # - ProtocolApprovalStorage # - RadiopharmaceuticalRadiationDoseSRStorage # - RealWorldValueMappingStorage @@ -253,6 +256,9 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2 # - RTBrachyApplicationSetupDeliveryInstructionStorage # - RTIonBeamsTreatmentRecordStorage # - RTIonPlanStorage +# - RTPhysicianIntentStorage +# - RTRadiationSetStorage +# - RTSegmentAnnotationStorage # - SegmentationStorage # - SegmentedVolumeRenderingVolumetricPresentationStateStorage # - SimplifiedAdultEchoSRStorage diff --git a/dcmnet/include/dcmtk/dcmnet/dimse.h b/dcmnet/include/dcmtk/dcmnet/dimse.h index eff6eaa2..e03a63dc 100644 --- a/dcmnet/include/dcmtk/dcmnet/dimse.h +++ b/dcmnet/include/dcmtk/dcmnet/dimse.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2014, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were partly developed by @@ -136,17 +136,16 @@ extern DCMTK_DCMNET_EXPORT OFGlobal dcmMaxOutgoingPDUSize; /* default 2^ */ /* Storage Specific Codes*/ #define STATUS_STORE_Refused_OutOfResources /* high byte */ 0xa700 -#define STATUS_STORE_Refused_SOPClassNotSupported /* high byte */ 0xa800 +#define STATUS_STORE_Refused_SOPClassNotSupported 0x0122 #define STATUS_STORE_Error_DataSetDoesNotMatchSOPClass /* high byte */ 0xa900 #define STATUS_STORE_Error_CannotUnderstand /* high nibble */ 0xc000 #define STATUS_STORE_Warning_CoercionOfDataElements 0xb000 -#define STATUS_STORE_Warning_CoersionOfDataElements 0xb000 // WARNING: This constant will be removed from DCMTK in the future, instead use STATUS_STORE_Warning_CoercionOfDataElements #define STATUS_STORE_Warning_DataSetDoesNotMatchSOPClass 0xb007 #define STATUS_STORE_Warning_ElementsDiscarded 0xb006 /* Find Specific Codes */ #define STATUS_FIND_Refused_OutOfResources 0xa700 -#define STATUS_FIND_Refused_SOPClassNotSupported 0xa800 +#define STATUS_FIND_Refused_SOPClassNotSupported 0x0122 #define STATUS_FIND_Failed_IdentifierDoesNotMatchSOPClass 0xa900 #define STATUS_FIND_Failed_UnableToProcess /* high nibble */ 0xc000 #define STATUS_FIND_Cancel_MatchingTerminatedDueToCancelRequest 0xfe00 @@ -155,7 +154,7 @@ extern DCMTK_DCMNET_EXPORT OFGlobal dcmMaxOutgoingPDUSize; /* default 2^ /* Move Specific Codes */ #define STATUS_MOVE_Refused_OutOfResourcesNumberOfMatches 0xa701 #define STATUS_MOVE_Refused_OutOfResourcesSubOperations 0xa702 -#define STATUS_MOVE_Failed_SOPClassNotSupported 0xa800 +#define STATUS_MOVE_Failed_SOPClassNotSupported 0x0122 #define STATUS_MOVE_Failed_MoveDestinationUnknown 0xa801 #define STATUS_MOVE_Failed_IdentifierDoesNotMatchSOPClass 0xa900 #define STATUS_MOVE_Failed_UnableToProcess /* high nibble */ 0xc000 @@ -165,7 +164,7 @@ extern DCMTK_DCMNET_EXPORT OFGlobal dcmMaxOutgoingPDUSize; /* default 2^ /* Get Specific Codes */ #define STATUS_GET_Refused_OutOfResourcesNumberOfMatches 0xa701 #define STATUS_GET_Refused_OutOfResourcesSubOperations 0xa702 -#define STATUS_GET_Failed_SOPClassNotSupported 0xa800 +#define STATUS_GET_Failed_SOPClassNotSupported 0x0122 #define STATUS_GET_Failed_IdentifierDoesNotMatchSOPClass 0xa900 #define STATUS_GET_Failed_UnableToProcess /* high nibble */ 0xc000 #define STATUS_GET_Cancel_SubOperationsTerminatedDueToCancelIndication 0xfe00 @@ -670,7 +669,12 @@ DIMSE_echoUser( /* blocking info for response */ T_DIMSE_BlockingMode blockMode, int timeout, /* out */ - DIC_US *status, DcmDataset **statusDetail); + DIC_US *status, + /* if a pointer to a DcmDataset instance is passed in this variable, + * then any status detail information from the C-ECHO-RSP message will + * be returned in this dataset. + */ + DcmDataset **statusDetail); DCMTK_DCMNET_EXPORT OFCondition DIMSE_sendEchoResponse(T_ASC_Association * assoc, @@ -719,6 +723,10 @@ DIMSE_storeUser( T_DIMSE_BlockingMode blockMode, int timeout, /* out */ T_DIMSE_C_StoreRSP *response, + /* if a pointer to a DcmDataset instance is passed in this variable, + * then any status detail information from the C-STORE-RSP message will + * be returned in this dataset. + */ DcmDataset **statusDetail, T_DIMSE_DetectedCancelParameters *checkForCancelParams = NULL, /* in */ @@ -732,7 +740,12 @@ typedef void (*DIMSE_StoreProviderCallback)( char *imageFileName, DcmDataset **imageDataSet, /* being received into */ /* in/out */ T_DIMSE_C_StoreRSP *response, /* final store response */ - /* out */ + /* out. The callback can assign a pointer to a dataset here and insert + * status detail attributes which will be added to the C-STORE-RSP message. + * The ownership of the DcmDataset instance is not transferred, and it is + * the responsibility of the library user to delete the instance after + * the call to DIMSE_storeProvider() has completed. + */ DcmDataset **statusDetail); DCMTK_DCMNET_EXPORT OFCondition @@ -762,7 +775,7 @@ typedef void (*DIMSE_FindUserCallback)( /* in */ void *callbackData, T_DIMSE_C_FindRQ *request, /* original find request */ - int responseCount, /* number of responses so far*/ + int responseCount, /* number of responses so far*/ T_DIMSE_C_FindRSP *response, /* pending response received */ DcmDataset *responseIdentifiers /* pending response identifiers */ ); @@ -778,7 +791,12 @@ DIMSE_findUser( /* blocking info for response */ T_DIMSE_BlockingMode blockMode, int timeout, /* out */ - T_DIMSE_C_FindRSP *response, DcmDataset **statusDetail); + T_DIMSE_C_FindRSP *response, + /* if a pointer to a DcmDataset instance is passed in this variable, + * then any status detail information from the C-FIND-RSP message will + * be returned in this dataset. + */ + DcmDataset **statusDetail); typedef void (*DIMSE_FindProviderCallback)( /* in */ @@ -788,6 +806,12 @@ typedef void (*DIMSE_FindProviderCallback)( /* out */ T_DIMSE_C_FindRSP *response, DcmDataset **responseIdentifiers, + /* out. The callback can assign a pointer to a dataset here and insert + * status detail attributes which will be added to the C-FIND-RSP message. + * The ownership of the DcmDataset instance is not transferred, and it is + * the responsibility of the library user to delete the instance after + * the call to DIMSE_storeProvider() has completed. + */ DcmDataset **statusDetail); DCMTK_DCMNET_EXPORT OFCondition @@ -834,7 +858,12 @@ DIMSE_moveUser( T_ASC_Network *net, DIMSE_SubOpProviderCallback subOpCallback, void *subOpCallbackData, /* out */ - T_DIMSE_C_MoveRSP *response, DcmDataset **statusDetail, + T_DIMSE_C_MoveRSP *response, + /* if a pointer to a DcmDataset instance is passed in this variable, + * then any status detail information from the C-MOVE-RSP message will + * be returned in this dataset. + */ + DcmDataset **statusDetail, DcmDataset **responseIdentifers, OFBool ignorePendingDatasets = OFFalse); @@ -844,7 +873,14 @@ typedef void (*DIMSE_MoveProviderCallback)( OFBool cancelled, T_DIMSE_C_MoveRQ *request, DcmDataset *requestIdentifiers, int responseCount, /* out */ - T_DIMSE_C_MoveRSP *response, DcmDataset **statusDetail, + T_DIMSE_C_MoveRSP *response, + /* out. The callback can assign a pointer to a dataset here and insert + * status detail attributes which will be added to the C-MOVE-RSP message. + * The ownership of the DcmDataset instance is not transferred, and it is + * the responsibility of the library user to delete the instance after + * the call to DIMSE_storeProvider() has completed. + */ + DcmDataset **statusDetail, DcmDataset **responseIdentifiers); DCMTK_DCMNET_EXPORT OFCondition @@ -890,7 +926,12 @@ DIMSE_getUser( T_ASC_Network *net, DIMSE_SubOpProviderCallback subOpCallback, void *subOpCallbackData, /* out */ - T_DIMSE_C_GetRSP *response, DcmDataset **statusDetail, + T_DIMSE_C_GetRSP *response, + /* if a pointer to a DcmDataset instance is passed in this variable, + * then any status detail information from the C-GET-RSP message will + * be returned in this dataset. + */ + DcmDataset **statusDetail, DcmDataset **responseIdentifers); typedef void (*DIMSE_GetProviderCallback)( @@ -899,7 +940,14 @@ typedef void (*DIMSE_GetProviderCallback)( OFBool cancelled, T_DIMSE_C_GetRQ *request, DcmDataset *requestIdentifiers, int responseCount, /* out */ - T_DIMSE_C_GetRSP *response, DcmDataset **statusDetail, + T_DIMSE_C_GetRSP *response, + /* out. The callback can assign a pointer to a dataset here and insert + * status detail attributes which will be added to the C-GET-RSP message. + * The ownership of the DcmDataset instance is not transferred, and it is + * the responsibility of the library user to delete the instance after + * the call to DIMSE_storeProvider() has completed. + */ + DcmDataset **statusDetail, DcmDataset **responseIdentifiers); DCMTK_DCMNET_EXPORT OFCondition @@ -947,7 +995,23 @@ DIMSE_checkForCancelRQ(T_ASC_Association * assoc, typedef void (*DIMSE_ProgressCallback)(void *callbackContext, unsigned long byteCount); - +/** send a DIMSE command and possibly also instance data from a file via network to another + * DICOM application. + * @param assoc The association (network connection to another DICOM application). + * @param presId The ID of the presentation context which shall be used + * @param msg Structure that represents a certain DIMSE command which shall be sent. + * @param statusDetail Detailed information with regard to the status information which is captured + * in the status element (0000,0900). Note that the value for element (0000,0900) + * is contained in this variable. + * @param dataFileName The name of the file that contains the instance data which shall be sent to + * the other DICOM application, NULL; if there is none. + * @param callback Pointer to a function which shall be called to indicate progress. + * @param callbackContext pointer to opaque object passed to the callback + * @param commandSet [out] If this parameter is not NULL + * it will return a copy of the DIMSE command which is sent to the other + * DICOM application. + * @return EC_Normal if successful, an error code otherwise. + */ DCMTK_DCMNET_EXPORT OFCondition DIMSE_sendMessageUsingFileData(T_ASC_Association *association, T_ASC_PresentationContextID presID, @@ -957,6 +1021,24 @@ DIMSE_sendMessageUsingFileData(T_ASC_Association *association, void *callbackContext, DcmDataset **commandSet=NULL); + +/** send a DIMSE command and possibly also instance data from a data object via network + * to another DICOM application. + * @param assoc The association (network connection to another DICOM application). + * @param presId The ID of the presentation context which shall be used + * @param msg Structure that represents a certain DIMSE command which shall be sent. + * @param statusDetail Detailed information with regard to the status information which is captured + * in the status element (0000,0900). Note that the value for element (0000,0900) + * is contained in this variable. + * @param dataObject The instance data which shall be sent to the other DICOM application, + * NULL, if there is none + * @param callback Pointer to a function which shall be called to indicate progress. + * @param callbackContext pointer to opaque object passed to the callback + * @param commandSet [out] If this parameter is not NULL + * it will return a copy of the DIMSE command which is sent to the other + * DICOM application. + * @return EC_Normal if successful, an error code otherwise. + */ DCMTK_DCMNET_EXPORT OFCondition DIMSE_sendMessageUsingMemoryData(T_ASC_Association *association, T_ASC_PresentationContextID presID, @@ -966,6 +1048,25 @@ DIMSE_sendMessageUsingMemoryData(T_ASC_Association *association, void *callbackContext, DcmDataset **commandSet=NULL); +/** receive a DIMSE command via network from another DICOM application. + * @param assoc The association (network connection to another DICOM application). + * @param blocking The blocking mode for reading data (either DIMSE_BLOCKING or DIMSE_NONBLOCKING) + * @param timeout Timeout interval for receiving data. If the blocking mode is DIMSE_NONBLOCKING + * and we are trying to read data from the incoming socket stream and no data has + * been received after timeout seconds, an error will be reported. + * @param presId [out] Contains in the end the ID of the presentation context which was specified in the DIMSE command. + * @param msg [out] Contains in the end information which represents a certain DIMSE command which was received. + * @param statusDetail [out] If a non-NULL value is passed this variable will in the end contain detailed + * information with regard to the status information which is captured in the status + * element (0000,0900). Note that the value for element (0000,0900) is not contained + * in this return value but in msg. For details on the structure of this object, see + * DICOM standard (year 2000) part 7, annex C) (or the corresponding section in a later + * version of the standard.) + * @param commandSet [out] If this parameter is not NULL + * it will return a copy of the DIMSE command which was received from the other + * DICOM application. + * @return EC_Normal if successful, an error code otherwise. + */ DCMTK_DCMNET_EXPORT OFCondition DIMSE_receiveCommand(T_ASC_Association *association, T_DIMSE_BlockingMode blocking, @@ -975,6 +1076,19 @@ DIMSE_receiveCommand(T_ASC_Association *association, DcmDataset **statusDetail, DcmDataset **commandSet=NULL); +/** receive one data set (of instance data) via network from another DICOM application and store in memory + * @param assoc The association (network connection to another DICOM application). + * @param blocking The blocking mode for receiving data (either DIMSE_BLOCKING or DIMSE_NONBLOCKING) + * @param timeout Timeout interval for receiving data (if the blocking mode is DIMSE_NONBLOCKING). + * @param presID [out] Contains in the end the ID of the presentation context which was used in the PDVs + * that were received on the network. If the PDVs show different presentation context + * IDs, this function will return an error. + * @param dataObject [out] Contains in the end the information which was received over the network. + * Note that this function assumes that either imageFileName or imageDataSet does not equal NULL. + * @param callback Pointer to a function which shall be called to indicate progress. + * @param callbackData Pointer to data which shall be passed to the progress indicating function + * @return EC_Normal if successful, an error code otherwise. + */ DCMTK_DCMNET_EXPORT OFCondition DIMSE_receiveDataSetInMemory(T_ASC_Association *association, T_DIMSE_BlockingMode blocking, @@ -984,6 +1098,22 @@ DIMSE_receiveDataSetInMemory(T_ASC_Association *association, DIMSE_ProgressCallback callback, void *callbackContext); +/** create a DICOM file, populate the meta-header from the content of the given + * C-STORE request, and return an ouput stream that can be used to store the + * dataset associated with the C-STORE request message. This function is used + * in conjunction with DIMSE_receiveDataSetInFile() to directly "stream" incoming + * DICOM datasets to file without storing them in memory and without passing + * them through the dcmdata parser. + * @param filename filename of file to be created + * @param request C-STORE request message from which the meta-header is populated + * @param assoc association network association over which the C-STORE request + * was received. Used to populate the aetitles in the metaheader. + * @param presIdCmd presentation context ID of the C-STORE message, determines + * the transfer syntax + * @param writeMetaheader write file with/without metaheader + * @param filestream pointer to output stream returned in this variable upon success. + * @return EC_Normal if successful, an error code otherwise. + */ DCMTK_DCMNET_EXPORT OFCondition DIMSE_createFilestream( /* in */ @@ -995,6 +1125,20 @@ DIMSE_createFilestream( /* out */ DcmOutputFileStream **filestream); +/** receive one data set (of instance data) via network from another DICOM application and store in file. + * @param assoc The association (network connection to another DICOM application). + * @param blocking The blocking mode for receiving data (either DIMSE_BLOCKING or DIMSE_NONBLOCKING) + * @param timeout Timeout interval for receiving data (if the blocking mode is DIMSE_NONBLOCKING). + * @param presID [out] Contains in the end the ID of the presentation context which was used in the PDVs + * that were received on the network. If the PDVs show different presentation context + * IDs, this function will return an error. + * @param filestream output stream to which the incoming dataset is written + * @param dataObject [out] Contains in the end the information which was received over the network. + * Note that this function assumes that either imageFileName or imageDataSet does not equal NULL. + * @param callback Pointer to a function which shall be called to indicate progress. + * @param callbackData Pointer to data which shall be passed to the progress indicating function + * @return EC_Normal if successful, an error code otherwise. + */ DCMTK_DCMNET_EXPORT OFCondition DIMSE_receiveDataSetInFile(T_ASC_Association *assoc, T_DIMSE_BlockingMode blocking, int timeout, @@ -1002,6 +1146,14 @@ DIMSE_receiveDataSetInFile(T_ASC_Association *assoc, DcmOutputStream *filestream, DIMSE_ProgressCallback callback, void *callbackData); +/** receive and discard one data set (of instance data) via network from another DICOM application. + * @param assoc The association (network connection to another DICOM application). + * @param blocking The blocking mode for receiving data (either DIMSE_BLOCKING or DIMSE_NONBLOCKING) + * @param timeout Timeout interval for receiving data (if the blocking mode is DIMSE_NONBLOCKING). + * @param bytesRead [out] number of bytes read + * @param pdvCount [out] number of PDVs read + * @return EC_Normal if successful, an error code otherwise. + */ DCMTK_DCMNET_EXPORT OFCondition DIMSE_ignoreDataSet( T_ASC_Association * assoc, T_DIMSE_BlockingMode blocking, diff --git a/dcmnet/include/dcmtk/dcmnet/dul.h b/dcmnet/include/dcmtk/dcmnet/dul.h index 61444105..9e87d22d 100644 --- a/dcmnet/include/dcmtk/dcmnet/dul.h +++ b/dcmnet/include/dcmtk/dcmnet/dul.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were partly developed by @@ -402,7 +402,7 @@ typedef enum { */ #define DUL_DULCOMPAT 2768240730UL -#define DUL_DIMSECOMPAT 917504UL +#define DUL_DIMSECOMPAT 983040UL #define DUL_MAXPDUCOMPAT 4278190335UL /* Define the function prototypes for this facility. diff --git a/dcmnet/libsrc/Makefile.dep b/dcmnet/libsrc/Makefile.dep index fdc2a042..3753df2b 100644 --- a/dcmnet/libsrc/Makefile.dep +++ b/dcmnet/libsrc/Makefile.dep @@ -41,23 +41,18 @@ assoc.o: assoc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -128,19 +123,9 @@ dcasccff.o: dcasccff.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/dccftsmp.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ @@ -193,19 +178,9 @@ dcasccfg.o: dcasccfg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/dccftsmp.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ @@ -314,15 +289,6 @@ dccfrsmp.o: dccfrsmp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ @@ -385,21 +351,9 @@ dccfuidh.o: dccfuidh.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h dcmlayer.o: dcmlayer.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmnet/dcmlayer.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -463,19 +417,15 @@ dcmtrans.o: dcmtrans.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -531,20 +481,16 @@ dcompat.o: dcompat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -605,15 +551,6 @@ dcuserid.o: dcuserid.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmnet/dntypes.h dulstruc.h dfindscu.o: dfindscu.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -653,32 +590,28 @@ dfindscu.o: dfindscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../include/dcmtk/dcmnet/dimse.h ../include/dcmtk/dcmnet/dicom.h \ ../include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ - ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/assoc.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../include/dcmtk/dcmnet/extneg.h \ + ../include/dcmtk/dcmnet/dcuserid.h ../include/dcmtk/dcmnet/dntypes.h \ + ../include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -693,7 +626,11 @@ dfindscu.o: dfindscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpath.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h + ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h dimcancl.o: dimcancl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../include/dcmtk/dcmnet/diutil.h ../include/dcmtk/dcmnet/dicom.h \ @@ -737,19 +674,15 @@ dimcancl.o: dimcancl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -806,15 +739,10 @@ dimcmd.o: dimcmd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -826,8 +754,9 @@ dimcmd.o: dimcmd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../include/dcmtk/dcmnet/diutil.h ../include/dcmtk/dcmnet/dicom.h \ - ../include/dcmtk/dcmnet/cond.h ../include/dcmtk/dcmnet/dndefine.h \ - ../include/dcmtk/dcmnet/dcompat.h \ + ../include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmnet/dimse.h ../include/dcmtk/dcmnet/lst.h \ @@ -877,19 +806,15 @@ dimdump.o: dimdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -946,19 +871,15 @@ dimecho.o: dimecho.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1015,19 +936,15 @@ dimfind.o: dimfind.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1084,19 +1001,15 @@ dimget.o: dimget.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1154,19 +1067,15 @@ dimmove.o: dimmove.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1223,19 +1132,15 @@ dimse.o: dimse.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1314,19 +1219,15 @@ dimstore.o: dimstore.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1390,14 +1291,10 @@ diutil.o: diutil.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1452,28 +1349,23 @@ dstorscp.o: dstorscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1529,15 +1421,19 @@ dstorscp.o: dstorscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dicom.h \ - ../include/dcmtk/dcmnet/cond.h ../include/dcmtk/dcmnet/dndefine.h \ - ../include/dcmtk/dcmnet/dcompat.h \ + ../include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h ../include/dcmtk/dcmnet/lst.h \ ../include/dcmtk/dcmnet/dul.h ../include/dcmtk/dcmnet/extneg.h \ ../include/dcmtk/dcmnet/dcuserid.h ../include/dcmtk/dcmnet/dntypes.h \ @@ -1586,24 +1482,19 @@ dstorscu.o: dstorscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ @@ -1660,24 +1551,27 @@ dstorscu.o: dstorscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dimse.h \ ../include/dcmtk/dcmnet/dicom.h ../include/dcmtk/dcmnet/cond.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ - ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/assoc.h \ - ../include/dcmtk/dcmnet/dcasccff.h ../include/dcmtk/dcmnet/dcasccfg.h \ - ../include/dcmtk/dcmnet/dccftsmp.h ../include/dcmtk/dcmnet/dccfuidh.h \ - ../include/dcmtk/dcmnet/dccfpcmp.h ../include/dcmtk/dcmnet/dccfrsmp.h \ - ../include/dcmtk/dcmnet/dccfenmp.h ../include/dcmtk/dcmnet/dccfprmp.h \ - ../include/dcmtk/dcmnet/diutil.h + ../../ofstd/include/dcmtk/ofstd/ofconsol.h ../include/dcmtk/dcmnet/lst.h \ + ../include/dcmtk/dcmnet/dul.h ../include/dcmtk/dcmnet/extneg.h \ + ../include/dcmtk/dcmnet/dcuserid.h ../include/dcmtk/dcmnet/dntypes.h \ + ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dcasccff.h \ + ../include/dcmtk/dcmnet/dcasccfg.h ../include/dcmtk/dcmnet/dccftsmp.h \ + ../include/dcmtk/dcmnet/dccfuidh.h ../include/dcmtk/dcmnet/dccfpcmp.h \ + ../include/dcmtk/dcmnet/dccfrsmp.h ../include/dcmtk/dcmnet/dccfenmp.h \ + ../include/dcmtk/dcmnet/dccfprmp.h ../include/dcmtk/dcmnet/diutil.h dul.o: dul.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmnet/diutil.h ../include/dcmtk/dcmnet/dicom.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ @@ -1721,19 +1615,15 @@ dul.o: dul.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1790,20 +1680,16 @@ dulconst.o: dulconst.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../include/dcmtk/dcmnet/diutil.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/diutil.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1859,25 +1745,20 @@ dulextra.o: dulextra.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ ../include/dcmtk/dcmnet/dntypes.h dulstruc.h dulpriv.h \ ../include/dcmtk/dcmnet/dcmtrans.h ../include/dcmtk/dcmnet/dcmlayer.h \ ../include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1929,25 +1810,20 @@ dulfsm.o: dulfsm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ ../include/dcmtk/dcmnet/dntypes.h dulstruc.h dulpriv.h dulfsm.h \ ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dcmtrans.h \ ../include/dcmtk/dcmnet/dcmlayer.h ../include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2005,11 +1881,6 @@ dulparse.o: dulparse.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ @@ -2017,6 +1888,7 @@ dulparse.o: dulparse.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2036,6 +1908,12 @@ dulpres.o: dulpres.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../include/dcmtk/dcmnet/dicom.h ../include/dcmtk/dcmnet/cond.h \ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ @@ -2057,7 +1935,6 @@ dulpres.o: dulpres.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/appender.h \ ../../ofstd/include/dcmtk/ofstd/ofmem.h \ ../../ofstd/include/dcmtk/ofstd/ofutil.h \ - ../../ofstd/include/dcmtk/ofstd/oftraits.h \ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ ../../oflog/include/dcmtk/oflog/layout.h \ ../../oflog/include/dcmtk/oflog/streams.h \ @@ -2069,16 +1946,6 @@ dulpres.o: dulpres.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ @@ -2139,28 +2006,23 @@ scp.o: scp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2216,15 +2078,19 @@ scp.o: scp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dicom.h \ - ../include/dcmtk/dcmnet/cond.h ../include/dcmtk/dcmnet/dndefine.h \ - ../include/dcmtk/dcmnet/dcompat.h \ + ../include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h ../include/dcmtk/dcmnet/lst.h \ ../include/dcmtk/dcmnet/dul.h ../include/dcmtk/dcmnet/extneg.h \ ../include/dcmtk/dcmnet/dcuserid.h ../include/dcmtk/dcmnet/dntypes.h \ @@ -2280,19 +2146,9 @@ scpcfg.o: scpcfg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../include/dcmtk/dcmnet/lst.h ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/dcmnet/dul.h ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/dccftsmp.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ @@ -2301,6 +2157,11 @@ scpcfg.o: scpcfg.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmnet/dccfprmp.h ../include/dcmtk/dcmnet/dimse.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2346,27 +2207,22 @@ scppool.o: scppool.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2422,15 +2278,19 @@ scppool.o: scppool.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dicom.h \ - ../include/dcmtk/dcmnet/cond.h ../include/dcmtk/dcmnet/dndefine.h \ - ../include/dcmtk/dcmnet/dcompat.h \ + ../include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h ../include/dcmtk/dcmnet/lst.h \ ../include/dcmtk/dcmnet/dul.h ../include/dcmtk/dcmnet/extneg.h \ ../include/dcmtk/dcmnet/dcuserid.h ../include/dcmtk/dcmnet/dntypes.h \ @@ -2474,28 +2334,23 @@ scpthrd.o: scpthrd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2551,15 +2406,19 @@ scpthrd.o: scpthrd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dicom.h \ - ../include/dcmtk/dcmnet/cond.h ../include/dcmtk/dcmnet/dndefine.h \ - ../include/dcmtk/dcmnet/dcompat.h \ + ../include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h ../include/dcmtk/dcmnet/lst.h \ ../include/dcmtk/dcmnet/dul.h ../include/dcmtk/dcmnet/extneg.h \ ../include/dcmtk/dcmnet/dcuserid.h ../include/dcmtk/dcmnet/dntypes.h \ @@ -2604,26 +2463,21 @@ scu.o: scu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2679,22 +2533,25 @@ scu.o: scu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../include/dcmtk/dcmnet/dndefine.h ../include/dcmtk/dcmnet/dimse.h \ ../include/dcmtk/dcmnet/dicom.h ../include/dcmtk/dcmnet/cond.h \ - ../include/dcmtk/dcmnet/lst.h ../include/dcmtk/dcmnet/dul.h \ - ../include/dcmtk/dcmnet/extneg.h ../include/dcmtk/dcmnet/dcuserid.h \ - ../include/dcmtk/dcmnet/dntypes.h ../include/dcmtk/dcmnet/assoc.h \ - ../include/dcmtk/dcmnet/dcasccff.h ../include/dcmtk/dcmnet/dcasccfg.h \ - ../include/dcmtk/dcmnet/dccftsmp.h ../include/dcmtk/dcmnet/dccfuidh.h \ - ../include/dcmtk/dcmnet/dccfpcmp.h ../include/dcmtk/dcmnet/dccfrsmp.h \ - ../include/dcmtk/dcmnet/dccfenmp.h ../include/dcmtk/dcmnet/dccfprmp.h \ - ../include/dcmtk/dcmnet/diutil.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h ../include/dcmtk/dcmnet/lst.h \ + ../include/dcmtk/dcmnet/dul.h ../include/dcmtk/dcmnet/extneg.h \ + ../include/dcmtk/dcmnet/dcuserid.h ../include/dcmtk/dcmnet/dntypes.h \ + ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dcasccff.h \ + ../include/dcmtk/dcmnet/dcasccfg.h ../include/dcmtk/dcmnet/dccftsmp.h \ + ../include/dcmtk/dcmnet/dccfuidh.h ../include/dcmtk/dcmnet/dccfpcmp.h \ + ../include/dcmtk/dcmnet/dccfrsmp.h ../include/dcmtk/dcmnet/dccfenmp.h \ + ../include/dcmtk/dcmnet/dccfprmp.h ../include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrmf.h diff --git a/dcmnet/libsrc/dimdump.cc b/dcmnet/libsrc/dimdump.cc index e2a97518..76e6ef9b 100644 --- a/dcmnet/libsrc/dimdump.cc +++ b/dcmnet/libsrc/dimdump.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1993-2011, OFFIS e.V. + * Copyright (C) 1993-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -185,7 +185,7 @@ static void DIMSE_printCStoreStatusString(STD_NAMESPACE ostream& dumpStream, int { dumpStream << ": Error: Refused - Out of resources"; } - else if ((status & 0xff00) == STATUS_STORE_Refused_SOPClassNotSupported) + else if (status == STATUS_STORE_Refused_SOPClassNotSupported) { dumpStream << ": Error: Refused - SOP Class not supported"; } @@ -236,7 +236,7 @@ static void DIMSE_printCFindStatusString(STD_NAMESPACE ostream& dumpStream, int { dumpStream << ": Error: Refused - Out of resources"; } - else if ((status & 0xff00) == STATUS_FIND_Refused_SOPClassNotSupported) + else if (status == STATUS_FIND_Refused_SOPClassNotSupported) { dumpStream << ": Error: Refused - SOP Class not supported"; } @@ -274,7 +274,58 @@ static void DIMSE_printCFindStatusString(STD_NAMESPACE ostream& dumpStream, int } } -static void DIMSE_printCGetMoveStatusString(STD_NAMESPACE ostream& dumpStream, int status) +static void DIMSE_printCGetStatusString(STD_NAMESPACE ostream& dumpStream, int status) +{ + dumpStream << "0x" << STD_NAMESPACE hex << STD_NAMESPACE setfill('0') + << STD_NAMESPACE setw(4) << status; + + if ((status & 0xf000) == STATUS_GET_Failed_UnableToProcess) + { + dumpStream << ": Error: Failed - Unable to process"; + } + else if (status == STATUS_GET_Refused_OutOfResourcesNumberOfMatches) + { + dumpStream << ": Error: Refused - Out of resources - Number of matches"; + } + else if (status == STATUS_GET_Refused_OutOfResourcesSubOperations) + { + dumpStream << ": Error: Refused - Out of resources - Suboperations"; + } + else if (status == STATUS_GET_Failed_SOPClassNotSupported) + { + dumpStream << ": Failed: SOP Class not supported"; + } + else if (status == STATUS_GET_Failed_IdentifierDoesNotMatchSOPClass) + { + dumpStream << ": Failed: Identifier does not match SOP Class"; + } + else if (status == STATUS_GET_Cancel_SubOperationsTerminatedDueToCancelIndication) + { + dumpStream << ": Cancel: Suboperations terminated due to Cancel Indication"; + } + else if (status == STATUS_GET_Warning_SubOperationsCompleteOneOrMoreFailures) + { + dumpStream << ": Warning: Suboperations complete, one or more failures"; + } + else if (DICOM_WARNING_STATUS(status)) + { + dumpStream << ": Warning"; + } + else if (DICOM_PENDING_STATUS(status)) + { + dumpStream << ": Pending"; + } + else if (status == STATUS_Success) + { + dumpStream << ": Success"; + } + else + { + dumpStream << ": Unknown Status Code"; + } +} + +static void DIMSE_printCMoveStatusString(STD_NAMESPACE ostream& dumpStream, int status) { dumpStream << "0x" << STD_NAMESPACE hex << STD_NAMESPACE setfill('0') << STD_NAMESPACE setw(4) << status; @@ -547,7 +598,7 @@ OFString& DIMSE_dumpMessage(OFString &str, T_DIMSE_C_GetRSP &msg, enum DIMSE_dir else stream << "none" << OFendl; stream << "Data Set : " << ((msg.DataSetType==DIMSE_DATASET_NULL) ? "none" : "present") << OFendl << "DIMSE Status : "; - DIMSE_printCGetMoveStatusString(stream, msg.DimseStatus); + DIMSE_printCGetStatusString(stream, msg.DimseStatus); OFSTRINGSTREAM_GETSTR(stream, result) str += result; @@ -626,7 +677,7 @@ OFString& DIMSE_dumpMessage(OFString &str, T_DIMSE_C_MoveRSP &msg, enum DIMSE_di else stream << "none" << OFendl; stream << "Data Set : " << ((msg.DataSetType==DIMSE_DATASET_NULL) ? "none" : "present") << OFendl << "DIMSE Status : "; - DIMSE_printCGetMoveStatusString(stream, msg.DimseStatus); + DIMSE_printCMoveStatusString(stream, msg.DimseStatus); OFSTRINGSTREAM_GETSTR(stream, result) str += result; diff --git a/dcmnet/libsrc/dimse.cc b/dcmnet/libsrc/dimse.cc index 22c38af3..50784afd 100644 --- a/dcmnet/libsrc/dimse.cc +++ b/dcmnet/libsrc/dimse.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were partly developed by @@ -1010,25 +1010,6 @@ DIMSE_sendMessageUsingFileData( DIMSE_ProgressCallback callback, void *callbackContext, DcmDataset **commandSet) - /* - * This function sends a DIMSE command and possibly also instance data from a file via network to another - * DICOM application. - * - * Parameters: - * assoc - [in] The association (network connection to another DICOM application). - * presId - [in] The ID of the presentation context which shall be used - * msg - [in] Structure that represents a certain DIMSE command which shall be sent. - * statusDetail - [in] Detailed information with regard to the status information which is captured - * in the status element (0000,0900). Note that the value for element (0000,0900) - * is contained in this variable. - * dataFileName - [in] The name of the file that contains the instance data which shall be sent to - * the other DICOM application, NULL; if there is none. - * callback - [in] Pointer to a function which shall be called to indicate progress. - * callbackContext - [] - * commandSet - [out] [optional parameter, default = NULL] If this parameter is not NULL - * it will return a copy of the DIMSE command which is sent to the other - * DICOM application. - */ { /* simply call DIMSE_sendMessage to accomplish this task */ return DIMSE_sendMessage(assoc, presID, msg, statusDetail, NULL, dataFileName, callback, callbackContext, commandSet); @@ -1044,25 +1025,6 @@ DIMSE_sendMessageUsingMemoryData( DIMSE_ProgressCallback callback, void *callbackContext, DcmDataset **commandSet) - /* - * This function sends a DIMSE command and possibly also instance data from a data object via network - * to another DICOM application. - * - * Parameters: - * assoc - [in] The association (network connection to another DICOM application). - * presId - [in] The ID of the presentation context which shall be used - * msg - [in] Structure that represents a certain DIMSE command which shall be sent. - * statusDetail - [in] Detailed information with regard to the status information which is captured - * in the status element (0000,0900). Note that the value for element (0000,0900) - * is contained in this variable. - * dataObject - [in] The instance data which shall be sent to the other DICOM application, - * NULL, if there is none - * callback - [in] Pointer to a function which shall be called to indicate progress. - * callbackContext - [] - * commandSet - [out] [optional parameter, default = NULL] If this parameter is not NULL - * it will return a copy of the DIMSE command which is sent to the other - * DICOM application. - */ { /* simply call DIMSE_sendMessage to accomplish this task */ return DIMSE_sendMessage(assoc, presID, msg, statusDetail, dataObject, NULL, callback, callbackContext, commandSet); @@ -1109,27 +1071,6 @@ DIMSE_receiveCommand( T_DIMSE_Message *msg, DcmDataset **statusDetail, DcmDataset **commandSet) - /* - * This function receives a DIMSE command via network from another DICOM application. - * - * Parameters: - * assoc - [in] The association (network connection to another DICOM application). - * blocking - [in] The blocking mode for reading data (either DIMSE_BLOCKING or DIMSE_NONBLOCKING) - * timeout - [in] Timeout interval for receiving data. If the blocking mode is DIMSE_NONBLOCKING - * and we are trying to read data from the incoming socket stream and no data has - * been received after timeout seconds, an error will be reported. - * presId - [out] Contains in the end the ID of the presentation context which was specified in the DIMSE command. - * msg - [out] Contains in the end information which represents a certain DIMSE command which was received. - * statusDetail - [out] If a non-NULL value is passed this variable will in the end contain detailed - * information with regard to the status information which is captured in the status - * element (0000,0900). Note that the value for element (0000,0900) is not contained - * in this return value but in msg. For details on the structure of this object, see - * DICOM standard (year 2000) part 7, annex C) (or the corresponding section in a later - * version of the standard.) - * commandSet - [out] [optional parameter, default = NULL] If this parameter is not NULL - * it will return a copy of the DIMSE command which was received from the other - * DICOM application. - */ { OFCondition cond = EC_Normal; unsigned long bytesRead; @@ -1568,21 +1509,6 @@ DIMSE_receiveDataSetInMemory( DcmDataset **dataObject, DIMSE_ProgressCallback callback, void *callbackData) - /* - * This function receives one data set (of instance data) via network from another DICOM application. - * - * Parameters: - * assoc - [in] The association (network connection to another DICOM application). - * blocking - [in] The blocking mode for receiving data (either DIMSE_BLOCKING or DIMSE_NONBLOCKING) - * timeout - [in] Timeout interval for receiving data (if the blocking mode is DIMSE_NONBLOCKING). - * presID - [out] Contains in the end the ID of the presentation context which was used in the PDVs - * that were received on the network. If the PDVs show different presentation context - * IDs, this function will return an error. - * dataObject - [out] Contains in the end the information which was received over the network. - * Note that this function assumes that either imageFileName or imageDataSet does not equal NULL. - * callback - [in] Pointer to a function which shall be called to indicate progress. - * callbackData - [in] Pointer to data which shall be passed to the progress indicating function - */ { OFCondition cond = EC_Normal; OFCondition econd = EC_Normal; diff --git a/dcmnet/libsrc/dimstore.cc b/dcmnet/libsrc/dimstore.cc index d5a24a65..24189054 100644 --- a/dcmnet/libsrc/dimstore.cc +++ b/dcmnet/libsrc/dimstore.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were partly developed by @@ -92,7 +92,7 @@ #endif #include "dcmtk/dcmnet/diutil.h" -#include "dcmtk/dcmnet/dimse.h" /* always include the module header */ +#include "dcmtk/dcmnet/dimse.h" /* always include the module header */ #include "dcmtk/dcmnet/cond.h" #include "dcmtk/dcmdata/dcostrmf.h" /* for class DcmOutputFileStream */ #include "dcmtk/ofstd/ofstd.h" /* for OFStandard::getFileSize() */ @@ -136,15 +136,15 @@ privateUserCallback(void *callbackData, unsigned long bytes) OFCondition DIMSE_storeUser( - T_ASC_Association *assoc, T_ASC_PresentationContextID presId, - T_DIMSE_C_StoreRQ *request, - const char *imageFileName, DcmDataset *imageDataSet, - DIMSE_StoreUserCallback callback, void *callbackData, - T_DIMSE_BlockingMode blockMode, int timeout, - T_DIMSE_C_StoreRSP *response, - DcmDataset **statusDetail, - T_DIMSE_DetectedCancelParameters *checkForCancelParams, - long imageFileTotalBytes) + T_ASC_Association *assoc, T_ASC_PresentationContextID presId, + T_DIMSE_C_StoreRQ *request, + const char *imageFileName, DcmDataset *imageDataSet, + DIMSE_StoreUserCallback callback, void *callbackData, + T_DIMSE_BlockingMode blockMode, int timeout, + T_DIMSE_C_StoreRSP *response, + DcmDataset **statusDetail, + T_DIMSE_DetectedCancelParameters *checkForCancelParams, + long imageFileTotalBytes) /* * This function transmits data from a file or a dataset to an SCP. The transmission is * conducted via network and using DIMSE C-STORE messages. Additionally, this function @@ -198,22 +198,22 @@ DIMSE_storeUser( /* in case the caller indicated that he has his own progress indicating */ /* function set some variables correspondingly so that this particular */ /* function will be called whenever progress shall be indicated. */ - privCallback = privateUserCallback; /* function defined above */ - callbackCtx.callbackData = callbackData; + privCallback = privateUserCallback; /* function defined above */ + callbackCtx.callbackData = callbackData; progress.state = DIMSE_StoreBegin; - progress.callbackCount = 1; - progress.progressBytes = 0; - if (imageFileTotalBytes > 0) progress.totalBytes = imageFileTotalBytes; - else - { + progress.callbackCount = 1; + progress.progressBytes = 0; + if (imageFileTotalBytes > 0) progress.totalBytes = imageFileTotalBytes; + else + { if (imageFileName != NULL) progress.totalBytes = OFstatic_cast(long, OFStandard::getFileSize(imageFileName)); else progress.totalBytes = dcmGuessModalityBytes(request->AffectedSOPClassUID); } - callbackCtx.progress = &progress; - callbackCtx.request = request; + callbackCtx.progress = &progress; + callbackCtx.request = request; callbackCtx.callback = callback; - /* execute initial callback */ - callback(callbackData, &progress, request); + /* execute initial callback */ + callback(callbackData, &progress, request); } else { /* in case the caller does not have his own progress indicating function no */ /* corresponding function will be called when progress shall be indicated. */ @@ -223,22 +223,22 @@ DIMSE_storeUser( /* send C-STORE-RQ message and instance data using file data or data set */ if (imageFileName != NULL) { cond = DIMSE_sendMessageUsingFileData(assoc, presId, &req, - NULL, imageFileName, privCallback, &callbackCtx); + NULL, imageFileName, privCallback, &callbackCtx); } else { cond = DIMSE_sendMessageUsingMemoryData(assoc, presId, &req, - NULL, imageDataSet, privCallback, &callbackCtx); + NULL, imageDataSet, privCallback, &callbackCtx); } if (cond != EC_Normal) { - return cond; + return cond; } /* execute final callback */ if (callback) { progress.state = DIMSE_StoreEnd; - progress.callbackCount++; - /* execute final callback */ - callback(callbackData, &progress, request); + progress.callbackCount++; + /* execute final callback */ + callback(callbackData, &progress, request); } /* check if a C-CANCEL-RQ message was encountered earlier */ @@ -296,10 +296,10 @@ DIMSE_storeUser( OFCondition DIMSE_sendStoreResponse(T_ASC_Association * assoc, - T_ASC_PresentationContextID presID, + T_ASC_PresentationContextID presID, const T_DIMSE_C_StoreRQ *request, - T_DIMSE_C_StoreRSP *response, - DcmDataset *statusDetail) + T_DIMSE_C_StoreRSP *response, + DcmDataset *statusDetail) /* * This function takes care of sending a C-STORE-RSP message over the network to the DICOM * application this application is connected with. @@ -315,7 +315,7 @@ DIMSE_sendStoreResponse(T_ASC_Association * assoc, * is contained in this variable. */ { - OFCondition cond = EC_Normal; + OFCondition cond = EC_Normal; T_DIMSE_Message rsp; /* create response message */ @@ -324,16 +324,14 @@ DIMSE_sendStoreResponse(T_ASC_Association * assoc, response->MessageIDBeingRespondedTo = request->MessageID; OFStandard::strlcpy(response->AffectedSOPClassUID, request->AffectedSOPClassUID, sizeof(response->AffectedSOPClassUID)); OFStandard::strlcpy(response->AffectedSOPInstanceUID, request->AffectedSOPInstanceUID, sizeof(response->AffectedSOPInstanceUID)); - response->opts = (O_STORE_AFFECTEDSOPCLASSUID | - O_STORE_AFFECTEDSOPINSTANCEUID); + response->opts = (O_STORE_AFFECTEDSOPCLASSUID | O_STORE_AFFECTEDSOPINSTANCEUID); response->DataSetType = DIMSE_DATASET_NULL; rsp.msg.CStoreRSP = *response; /* send response message over the network */ - cond = DIMSE_sendMessageUsingMemoryData(assoc, presID, &rsp, - statusDetail, NULL, NULL, NULL); + cond = DIMSE_sendMessageUsingMemoryData(assoc, presID, &rsp, statusDetail, NULL, NULL, NULL); - /* return reult value */ + /* return result value */ return cond; } @@ -345,8 +343,8 @@ typedef struct { char *imageFileName; DcmDataset **imageDataSet; T_DIMSE_C_StoreRSP *response; - DcmDataset **statusDetail; - DIMSE_StoreProviderCallback callback; + DcmDataset **statusDetail; + DIMSE_StoreProviderCallback callback; } DIMSE_PrivateProviderContext; static void @@ -359,20 +357,20 @@ privateProviderCallback(void *callbackData, unsigned long bytes) ctx->progress->callbackCount++; if (ctx->callback) { ctx->callback(ctx->callbackData, ctx->progress, ctx->request, - ctx->imageFileName, ctx->imageDataSet, ctx->response, - ctx->statusDetail); + ctx->imageFileName, ctx->imageDataSet, ctx->response, + ctx->statusDetail); } } OFCondition DIMSE_storeProvider( T_ASC_Association *assoc, - T_ASC_PresentationContextID presIdCmd, - T_DIMSE_C_StoreRQ *request, - const char* imageFileName, int writeMetaheader, - DcmDataset **imageDataSet, - DIMSE_StoreProviderCallback callback, void *callbackData, - T_DIMSE_BlockingMode blockMode, int timeout) + T_ASC_PresentationContextID presIdCmd, + T_DIMSE_C_StoreRQ *request, + const char* imageFileName, int writeMetaheader, + DcmDataset **imageDataSet, + DIMSE_StoreProviderCallback callback, void *callbackData, + T_DIMSE_BlockingMode blockMode, int timeout) /* * This function receives a data set over the network and either stores this data in a file (exactly as it was * received) or it stores this data in memory. Before, during and after the process of receiving data, the callback @@ -408,9 +406,9 @@ DIMSE_storeProvider( T_ASC_Association *assoc, /* initialize the C-STORE-RSP message variable */ bzero((char*)&response, sizeof(response)); - response.DimseStatus = STATUS_Success; /* assume */ + response.DimseStatus = STATUS_Success; /* assume */ response.MessageIDBeingRespondedTo = request->MessageID; - response.DataSetType = DIMSE_DATASET_NULL; /* always for C-STORE-RSP */ + response.DataSetType = DIMSE_DATASET_NULL; /* always for C-STORE-RSP */ OFStandard::strlcpy(response.AffectedSOPClassUID, request->AffectedSOPClassUID, sizeof(response.AffectedSOPClassUID)); OFStandard::strlcpy(response.AffectedSOPInstanceUID, request->AffectedSOPInstanceUID, sizeof(response.AffectedSOPInstanceUID)); response.opts = (O_STORE_AFFECTEDSOPCLASSUID | O_STORE_AFFECTEDSOPINSTANCEUID); @@ -420,23 +418,23 @@ DIMSE_storeProvider( T_ASC_Association *assoc, /* set up callback routine */ if (callback != NULL) { /* only if caller requires */ - privCallback = privateProviderCallback; /* function defined above */ - callbackCtx.callbackData = callbackData; + privCallback = privateProviderCallback; /* function defined above */ + callbackCtx.callbackData = callbackData; progress.state = DIMSE_StoreBegin; - progress.callbackCount = 1; - progress.progressBytes = 0; + progress.callbackCount = 1; + progress.progressBytes = 0; progress.totalBytes = dcmGuessModalityBytes(request->AffectedSOPClassUID); - callbackCtx.progress = &progress; - callbackCtx.request = request; - callbackCtx.imageFileName = (char*)imageFileName; - callbackCtx.imageDataSet = imageDataSet; - callbackCtx.response = &response; - callbackCtx.statusDetail = &statusDetail; + callbackCtx.progress = &progress; + callbackCtx.request = request; + callbackCtx.imageFileName = (char*)imageFileName; + callbackCtx.imageDataSet = imageDataSet; + callbackCtx.response = &response; + callbackCtx.statusDetail = &statusDetail; callbackCtx.callback = callback; - /* execute initial callback */ - callback(callbackData, &progress, request, - (char*)imageFileName, imageDataSet, - &response, &statusDetail); + /* execute initial callback */ + callback(callbackData, &progress, request, + (char*)imageFileName, imageDataSet, + &response, &statusDetail); } else { privCallback = NULL; } @@ -466,7 +464,7 @@ DIMSE_storeProvider( T_ASC_Association *assoc, cond = makeDcmnetCondition(DIMSEC_OUTOFRESOURCES, OF_error, s.c_str()); } } else { - /* if no error occured, receive data and write it to the file */ + /* if no error occurred, receive data and write it to the file */ cond = DIMSE_receiveDataSetInFile(assoc, blockMode, timeout, &presIdData, filestream, privCallback, &callbackCtx); delete filestream; if (cond != EC_Normal) @@ -479,17 +477,17 @@ DIMSE_storeProvider( T_ASC_Association *assoc, { /* receive data and store it in memory */ cond = DIMSE_receiveDataSetInMemory(assoc, blockMode, timeout, - &presIdData, imageDataSet, privCallback, &callbackCtx); + &presIdData, imageDataSet, privCallback, &callbackCtx); } else { /* if both variables are set to NULL, report an error */ - return DIMSE_BADDATA; + return DIMSE_BADDATA; } /* check if presentation context IDs of the command (which was received earlier) and of the data */ /* set (which was received just now) differ from each other. If this is the case, return an error. */ if (cond.good() && (presIdData != presIdCmd)) { - cond = makeDcmnetCondition(DIMSEC_INVALIDPRESENTATIONCONTEXTID, OF_error, "DIMSE: Presentation Contexts of Command and Data Differ"); + cond = makeDcmnetCondition(DIMSEC_INVALIDPRESENTATIONCONTEXTID, OF_error, "DIMSE: Presentation Contexts of Command and Data Differ"); } /* depending on the error status, set the success indicating flag in the response message */ @@ -504,11 +502,11 @@ DIMSE_storeProvider( T_ASC_Association *assoc, /* execute final callback (user does not have to provide callback) */ if (callback) { progress.state = DIMSE_StoreEnd; - progress.callbackCount++; - /* execute final callback */ - callback(callbackData, &progress, request, - (char*)imageFileName, imageDataSet, - &response, &statusDetail); + progress.callbackCount++; + /* execute final callback */ + callback(callbackData, &progress, request, + (char*)imageFileName, imageDataSet, + &response, &statusDetail); } /* send a C-STORE-RSP message over the network to the other DICOM application */ diff --git a/dcmnet/libsrc/diutil.cc b/dcmnet/libsrc/diutil.cc index cd8152dd..856143d8 100644 --- a/dcmnet/libsrc/diutil.cc +++ b/dcmnet/libsrc/diutil.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2017, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were partly developed by @@ -307,6 +307,9 @@ DU_cstoreStatusString(Uint16 statusCode) case STATUS_Success: s = "Success"; break; + case STATUS_STORE_Refused_SOPClassNotSupported: + s = "Refused: SOPClassNotSupported"; + break; case STATUS_STORE_Warning_CoercionOfDataElements: s = "Warning: CoercionOfDataElements"; break; @@ -324,9 +327,6 @@ DU_cstoreStatusString(Uint16 statusCode) case STATUS_STORE_Refused_OutOfResources: /* high byte */ s = "Refused: OutOfResources"; break; - case STATUS_STORE_Refused_SOPClassNotSupported: /* high byte */ - s = "Error: SOPClassNotSupported"; - break; case STATUS_STORE_Error_DataSetDoesNotMatchSOPClass: /* high byte */ s = "Error: DataSetDoesNotMatchSOPClass"; break; diff --git a/dcmnet/libsrc/dstorscu.cc b/dcmnet/libsrc/dstorscu.cc index 4cd7acf6..45421af3 100644 --- a/dcmnet/libsrc/dstorscu.cc +++ b/dcmnet/libsrc/dstorscu.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011-2016, OFFIS e.V. + * Copyright (C) 2011-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -961,6 +961,7 @@ void DcmStorageSCU::getStatusSummary(OFString &summary) const size_t numError = 0; size_t numWarning = 0; size_t numSuccess = 0; + size_t numUnknown = 0; size_t numPending = 0; size_t numInvalid = 0; OFListConstIterator(TransferEntry *) transferEntry = TransferList.begin(); @@ -974,7 +975,7 @@ void DcmStorageSCU::getStatusSummary(OFString &summary) const // check DIMSE status const Uint16 rspStatus = (*transferEntry)->ResponseStatusCode; if (((rspStatus & 0xff00) == STATUS_STORE_Refused_OutOfResources) || - ((rspStatus & 0xff00) == STATUS_STORE_Refused_SOPClassNotSupported)) + (rspStatus == STATUS_STORE_Refused_SOPClassNotSupported)) { ++numRefused; } @@ -1003,6 +1004,9 @@ void DcmStorageSCU::getStatusSummary(OFString &summary) const { --numSent; ++numInvalid; + } else { + /* any other (unknown/unsupported) DIMSE status code */ + ++numUnknown; } } ++transferEntry; @@ -1017,6 +1021,8 @@ void DcmStorageSCU::getStatusSummary(OFString &summary) const stream << OFendl << " * with status ERROR : " << numError; if (numRefused > 0) stream << OFendl << " * with status REFUSED : " << numRefused; + if (numUnknown > 0) + stream << OFendl << " * with unknown status : " << numUnknown; if (numSent < numInstances) stream << OFendl << "- NOT sent to the peer : " << (numInstances - numSent); if (numPending > 0) diff --git a/dcmnet/libsrc/dul.cc b/dcmnet/libsrc/dul.cc index 51d034e7..526fe60f 100644 --- a/dcmnet/libsrc/dul.cc +++ b/dcmnet/libsrc/dul.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were partly developed by @@ -88,9 +88,6 @@ #include "dcmtk/ofstd/ofstdinc.h" BEGIN_EXTERN_C -#ifdef HAVE_SYS_ERRNO_H -#include -#endif #ifdef HAVE_SYS_TIME_H #include #endif diff --git a/dcmnet/libsrc/dulpres.cc b/dcmnet/libsrc/dulpres.cc index f586942e..a0b8d618 100644 --- a/dcmnet/libsrc/dulpres.cc +++ b/dcmnet/libsrc/dulpres.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1994-2018, OFFIS e.V. + * Copyright (C) 1994-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were partly developed by @@ -60,6 +60,7 @@ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ #include "dcmtk/ofstd/ofcond.h" +#include "dcmtk/ofstd/ofstd.h" #define INCLUDE_CSTDLIB #define INCLUDE_CSTDIO diff --git a/dcmnet/libsrc/scpthrd.cc b/dcmnet/libsrc/scpthrd.cc index 2b5119d2..a6a2e61f 100644 --- a/dcmnet/libsrc/scpthrd.cc +++ b/dcmnet/libsrc/scpthrd.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2013, OFFIS e.V. + * Copyright (C) 2013-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -71,5 +71,8 @@ OFCondition DcmThreadSCP::run(T_ASC_Association* incomingAssoc) m_assoc = incomingAssoc; - return processAssociationRQ(); + OFCondition result = processAssociationRQ(); + notifyAssociationTermination(); + return result; + } diff --git a/dcmnet/tests/Makefile.dep b/dcmnet/tests/Makefile.dep index 78eaebf4..5a521d91 100644 --- a/dcmnet/tests/Makefile.dep +++ b/dcmnet/tests/Makefile.dep @@ -232,11 +232,14 @@ tpool.o: tpool.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dicom.h \ ../include/dcmtk/dcmnet/cond.h ../include/dcmtk/dcmnet/dndefine.h \ @@ -362,11 +365,14 @@ tscuscp.o: tscuscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmnet/assoc.h ../include/dcmtk/dcmnet/dicom.h \ ../include/dcmtk/dcmnet/cond.h ../include/dcmtk/dcmnet/dndefine.h \ diff --git a/dcmpmap/libsrc/Makefile.dep b/dcmpmap/libsrc/Makefile.dep index cd44343c..e945cfc1 100644 --- a/dcmpmap/libsrc/Makefile.dep +++ b/dcmpmap/libsrc/Makefile.dep @@ -38,23 +38,12 @@ dpmmodparametricmapimage.o: dpmmodparametricmapimage.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -62,6 +51,12 @@ dpmmodparametricmapimage.o: dpmmodparametricmapimage.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -117,23 +112,12 @@ dpmmodparametricmapseries.o: dpmmodparametricmapseries.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -141,6 +125,12 @@ dpmmodparametricmapseries.o: dpmmodparametricmapseries.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -198,11 +188,14 @@ dpmmodparametricmapseries.o: dpmmodparametricmapseries.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h dpmparametricmapbase.o: dpmparametricmapbase.cc \ ../../config/include/dcmtk/config/osconfig.h \ @@ -248,22 +241,17 @@ dpmparametricmapbase.o: dpmparametricmapbase.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -323,11 +311,14 @@ dpmparametricmapbase.o: dpmparametricmapbase.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \ ../include/dcmtk/dcmpmap/dpmdef.h \ @@ -426,15 +417,10 @@ dpmparametricmapiod.o: dpmparametricmapiod.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -500,11 +486,14 @@ dpmparametricmapiod.o: dpmparametricmapiod.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmfg/include/dcmtk/dcmfg/fgtypes.h \ ../../dcmfg/include/dcmtk/dcmfg/fgdefine.h \ @@ -594,18 +583,6 @@ dpmtypes.o: dpmtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ @@ -613,7 +590,14 @@ dpmtypes.o: dpmtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -669,11 +653,14 @@ dpmtypes.o: dpmtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \ diff --git a/dcmpstat/apps/Makefile.dep b/dcmpstat/apps/Makefile.dep index 1fe3ec50..8b610b21 100644 --- a/dcmpstat/apps/Makefile.dep +++ b/dcmpstat/apps/Makefile.dep @@ -108,11 +108,14 @@ dcmmkcrv.o: dcmmkcrv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h dcmmklut.o: dcmmklut.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ @@ -149,26 +152,21 @@ dcmmklut.o: dcmmklut.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -224,12 +222,20 @@ dcmmklut.o: dcmmklut.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dicrvfit.h \ ../../dcmimgle/include/dcmtk/dcmimgle/digsdfn.h \ ../../dcmimgle/include/dcmtk/dcmimgle/didispfn.h \ @@ -270,19 +276,6 @@ dcmp2pgm.o: dcmp2pgm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dpdefine.h \ @@ -290,10 +283,18 @@ dcmp2pgm.o: dcmp2pgm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -349,11 +350,14 @@ dcmp2pgm.o: dcmp2pgm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -366,6 +370,7 @@ dcmp2pgm.o: dcmp2pgm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofalign.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -400,7 +405,11 @@ dcmp2pgm.o: dcmp2pgm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diluptab.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dibaslut.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoopx.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/didispfn.h + ../../dcmimgle/include/dcmtk/dcmimgle/didispfn.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h dcmprscp.o: dcmprscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../include/dcmtk/dcmpstat/dvpsdef.h ../include/dcmtk/dcmpstat/dpdefine.h \ @@ -435,19 +444,6 @@ dcmprscp.o: dcmprscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmpstat/dviface.h ../include/dcmtk/dcmpstat/dvpscf.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -456,10 +452,18 @@ dcmprscp.o: dcmprscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -515,11 +519,14 @@ dcmprscp.o: dcmprscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -532,6 +539,7 @@ dcmprscp.o: dcmprscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofalign.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -550,6 +558,10 @@ dcmprscp.o: dcmprscp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/offname.h \ ../include/dcmtk/dcmpstat/dvcache.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmpstat/dvpsprt.h ../include/dcmtk/dcmpstat/dvpspll.h \ ../include/dcmtk/dcmpstat/dvpsspl.h ../include/dcmtk/dcmpstat/dvpshlp.h \ ../../oflog/include/dcmtk/oflog/fileap.h \ @@ -598,19 +610,6 @@ dcmprscu.o: dcmprscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmpstat/dviface.h ../include/dcmtk/dcmpstat/dvpscf.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -619,10 +618,18 @@ dcmprscu.o: dcmprscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -678,11 +685,14 @@ dcmprscu.o: dcmprscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -695,6 +705,7 @@ dcmprscu.o: dcmprscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofalign.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmdata/include/dcmtk/dcmdata/dcspchrs.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h \ ../../dcmqrdb/include/dcmtk/dcmqrdb/dcmqrdbi.h \ @@ -709,6 +720,10 @@ dcmprscu.o: dcmprscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../ofstd/include/dcmtk/ofstd/offname.h \ ../include/dcmtk/dcmpstat/dvcache.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoimg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ @@ -845,11 +860,14 @@ dcmpschk.o: dcmpschk.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -977,11 +995,14 @@ dcmpsmk.o: dcmpsmk.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -1034,19 +1055,6 @@ dcmpsprt.o: dcmpsprt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dpdefine.h \ @@ -1054,10 +1062,18 @@ dcmpsprt.o: dcmpsprt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1113,11 +1129,14 @@ dcmpsprt.o: dcmpsprt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -1130,6 +1149,7 @@ dcmpsprt.o: dcmpsprt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofalign.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -1165,7 +1185,11 @@ dcmpsprt.o: dcmpsprt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diluptab.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dibaslut.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoopx.h \ - ../../dcmimgle/include/dcmtk/dcmimgle/didispfn.h + ../../dcmimgle/include/dcmtk/dcmimgle/didispfn.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h dcmpsrcv.o: dcmpsrcv.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmpstat/dvpsdef.h ../include/dcmtk/dcmpstat/dpdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ @@ -1200,19 +1224,6 @@ dcmpsrcv.o: dcmpsrcv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmpstat/dvpscf.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1222,11 +1233,20 @@ dcmpsrcv.o: dcmpsrcv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1244,6 +1264,10 @@ dcmpsrcv.o: dcmpsrcv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dntypes.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmqrdb/include/dcmtk/dcmqrdb/dcmqrdbi.h \ ../../dcmqrdb/include/dcmtk/dcmqrdb/dcmqrdba.h \ ../../dcmqrdb/include/dcmtk/dcmqrdb/qrdefine.h \ @@ -1301,11 +1325,14 @@ dcmpsrcv.o: dcmpsrcv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ ../include/dcmtk/dcmpstat/dvpsgal.h ../include/dcmtk/dcmpstat/dvpscul.h \ @@ -1351,19 +1378,6 @@ dcmpssnd.o: dcmpssnd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmpstat/dvpscf.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1373,15 +1387,24 @@ dcmpssnd.o: dcmpssnd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -1398,6 +1421,10 @@ dcmpssnd.o: dcmpssnd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dntypes.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmpstat/dvpshlp.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ diff --git a/dcmpstat/apps/dcmmklut.cc b/dcmpstat/apps/dcmmklut.cc index 7b03f4a3..cd651aff 100644 --- a/dcmpstat/apps/dcmmklut.cc +++ b/dcmpstat/apps/dcmmklut.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -125,11 +125,7 @@ static OFCondition readTextFile(const char *filename, if ((filename != NULL) && (strlen(filename) > 0)) { OFLOG_INFO(dcmmklutLogger, "reading text file ..."); -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE ifstream file(filename, STD_NAMESPACE ios::in | STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE ifstream file(filename, STD_NAMESPACE ios::in); -#endif + STD_NAMESPACE ifstream file(filename, OFopenmode_in_nocreate); if (file) { inputEntries = 0; diff --git a/dcmpstat/apps/dcmprscp.cc b/dcmpstat/apps/dcmprscp.cc index 73a95a6a..f7c39413 100644 --- a/dcmpstat/apps/dcmprscp.cc +++ b/dcmpstat/apps/dcmprscp.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -360,6 +360,7 @@ int main(int argc, char *argv[]) DcmTLSSecurityProfile tlsProfile = TSP_Profile_BCP195; // default if (profileName == "BCP195") tlsProfile = TSP_Profile_BCP195; else if (profileName == "BCP195-ND") tlsProfile = TSP_Profile_BCP195_ND; + else if (profileName == "BCP195-EX") tlsProfile = TSP_Profile_BCP195_Extended; else if (profileName == "AES") tlsProfile = TSP_Profile_AES; else if (profileName == "BASIC") tlsProfile = TSP_Profile_Basic; else if (profileName == "NULL") tlsProfile = TSP_Profile_IHE_ATNA_Unencrypted; diff --git a/dcmpstat/apps/dcmprscu.cc b/dcmpstat/apps/dcmprscu.cc index 17bcc67e..399af7ae 100644 --- a/dcmpstat/apps/dcmprscu.cc +++ b/dcmpstat/apps/dcmprscu.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2018, OFFIS e.V. + * Copyright (C) 1999-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -888,6 +888,7 @@ int main(int argc, char *argv[]) DcmTLSSecurityProfile tlsProfile = TSP_Profile_BCP195; // default if (profileName == "BCP195") tlsProfile = TSP_Profile_BCP195; else if (profileName == "BCP195-ND") tlsProfile = TSP_Profile_BCP195_ND; + else if (profileName == "BCP195-EX") tlsProfile = TSP_Profile_BCP195_Extended; else if (profileName == "AES") tlsProfile = TSP_Profile_AES; else if (profileName == "BASIC") tlsProfile = TSP_Profile_Basic; else if (profileName == "NULL") tlsProfile = TSP_Profile_IHE_ATNA_Unencrypted; diff --git a/dcmpstat/apps/dcmpsprt.cc b/dcmpstat/apps/dcmpsprt.cc index 5b7a3a45..c7273f24 100644 --- a/dcmpstat/apps/dcmpsprt.cc +++ b/dcmpstat/apps/dcmpsprt.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1999-2017, OFFIS e.V. + * Copyright (C) 1999-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -61,11 +61,7 @@ static int addOverlay(const char *filename, { if ((filename != NULL) && (pixel != NULL)) { -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE ifstream input(filename, STD_NAMESPACE ios::in | STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE ifstream input(filename); -#endif + STD_NAMESPACE ifstream input(filename, OFopenmode_in_nocreate); if (input) { char c; diff --git a/dcmpstat/apps/dcmpsrcv.cc b/dcmpstat/apps/dcmpsrcv.cc index d7fa1c6c..2d108c88 100644 --- a/dcmpstat/apps/dcmpsrcv.cc +++ b/dcmpstat/apps/dcmpsrcv.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1999-2018, OFFIS e.V. + * Copyright (C) 1999-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -799,6 +799,7 @@ static void terminateAllReceivers(DVConfiguration& dvi) DcmTLSSecurityProfile tlsProfile = TSP_Profile_BCP195; // default if (profileName == "BCP195") tlsProfile = TSP_Profile_BCP195; else if (profileName == "BCP195-ND") tlsProfile = TSP_Profile_BCP195_ND; + else if (profileName == "BCP195-EX") tlsProfile = TSP_Profile_BCP195_Extended; else if (profileName == "AES") tlsProfile = TSP_Profile_AES; else if (profileName == "BASIC") tlsProfile = TSP_Profile_Basic; else if (profileName == "NULL") tlsProfile = TSP_Profile_IHE_ATNA_Unencrypted; diff --git a/dcmpstat/apps/dcmpssnd.cc b/dcmpstat/apps/dcmpssnd.cc index 009381b1..3af86485 100644 --- a/dcmpstat/apps/dcmpssnd.cc +++ b/dcmpstat/apps/dcmpssnd.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1999-2018, OFFIS e.V. + * Copyright (C) 1999-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -580,6 +580,7 @@ int main(int argc, char *argv[]) DcmTLSSecurityProfile tlsProfile = TSP_Profile_BCP195; // default if (profileName == "BCP195") tlsProfile = TSP_Profile_BCP195; else if (profileName == "BCP195-ND") tlsProfile = TSP_Profile_BCP195_ND; + else if (profileName == "BCP195-EX") tlsProfile = TSP_Profile_BCP195_Extended; else if (profileName == "AES") tlsProfile = TSP_Profile_AES; else if (profileName == "BASIC") tlsProfile = TSP_Profile_Basic; else if (profileName == "NULL") tlsProfile = TSP_Profile_IHE_ATNA_Unencrypted; diff --git a/dcmpstat/etc/dcmpstat.cfg b/dcmpstat/etc/dcmpstat.cfg index 3ed834ae..5b575948 100644 --- a/dcmpstat/etc/dcmpstat.cfg +++ b/dcmpstat/etc/dcmpstat.cfg @@ -1,5 +1,5 @@ # -# Copyright (C) 1998-2018, OFFIS e.V. +# Copyright (C) 1998-2019, OFFIS e.V. # All rights reserved. See COPYRIGHT file for details. # # This software and supporting documentation were developed by @@ -511,9 +511,10 @@ WarnUnsignedObjectsInSR = true # Known terms are: # BCP195: BCP 195 TLS Profile (default) # BCP195-ND: Non-downgrading BCP 195 TLS Profile +# BCP195-EX: Extended BCP 195 TLS Profile # AES: AES TLS Secure Transport Connection Profile (retired) # BASIC: Basic TLS Secure Transport Connection Profile (retired) -# NULL: Authenticated unencrypted communication (retired) +# NULL: Authenticated unencrypted communication (retired) # # TLSProfile = BCP195 # @@ -909,7 +910,6 @@ WarnUnsignedObjectsInSR = true # ---------------------------------------------------------------------------- - # ---------------------------------------------------------------------------- # # We define three send targets: @@ -917,7 +917,6 @@ WarnUnsignedObjectsInSR = true # DICOM associations on port 10004, the others accept TLS secured DICOM # associations on port 10007, with different ciphersuites. # -# # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- @@ -1080,7 +1079,6 @@ PresentationLUTinFilmSession = false Supports12Bit = true SupportsPresentationLUT = true - # ---------------------------------------------------------------------------- # Print SCP that supports most options of the DICOM Print protocol and # the IHE technical framework requirements for Print Server actors: @@ -1131,7 +1129,6 @@ PeerAuthentication = REQUIRE Certificate = sitecert.pem PrivateKey = sitekey.pem - # ---------------------------------------------------------------------------- # Print SCP that only supports the absolute minimum that is required by # the IHE technical framework for Print Server actors: @@ -1170,7 +1167,6 @@ PeerAuthentication = REQUIRE Certificate = sitecert.pem PrivateKey = sitekey.pem - # ============================================================================ # Logins and Certificates for Digital Signature purposes # are defined in the following section. diff --git a/dcmpstat/include/dcmtk/dcmpstat/dvpsal.h b/dcmpstat/include/dcmtk/dcmpstat/dvpsal.h index 5d3690a4..be75f773 100644 --- a/dcmpstat/include/dcmtk/dcmpstat/dvpsal.h +++ b/dcmpstat/include/dcmtk/dcmpstat/dvpsal.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2012, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -31,7 +31,7 @@ /** a curve or overlay activation layer in a presentation state (internal use only). * This class manages the data structures comprising a single curve * activation layer or overlay activation layer - * (one instance of the Curve Activation Layer Module or + * (one instance of the Curve Activation Layer Module or * Overlay Activation Layer Module repeating elements) * contained in a Presentation State object. */ @@ -41,7 +41,7 @@ class DCMTK_DCMPSTAT_EXPORT DVPSOverlayCurveActivationLayer public: /// default constructor DVPSOverlayCurveActivationLayer(); - + /// copy constructor DVPSOverlayCurveActivationLayer(const DVPSOverlayCurveActivationLayer& copy); @@ -56,7 +56,7 @@ public: /** reads the activation layer for the specified repeating group from a DICOM dataset. * The DICOM elements of the Overlay/Curve Activation Layer module are copied - * from the dataset to this object. + * from the dataset to this object. * The completeness of the module is checked. * If this method returns an error code, the object is in undefined state afterwards. * @param dset the DICOM dataset from which the activation layer is to be read @@ -64,7 +64,7 @@ public: * @return EC_Normal if successful, an error code otherwise. */ OFCondition read(DcmItem &dset, Uint16 ovGroup); - + /** writes the activation layer managed by this object to a DICOM dataset. * Copies of the DICOM elements managed by this object are inserted into * the DICOM dataset. @@ -84,7 +84,7 @@ public: void setRepeatingGroup(Uint16 rGroup); /** get activation layer name. - * @return a pointer to the activation layer name + * @return a pointer to the activation layer name (might be NULL) */ const char *getActivationLayer(); diff --git a/dcmpstat/libsrc/Makefile.dep b/dcmpstat/libsrc/Makefile.dep index a3cd6ef5..8fed5dd9 100644 --- a/dcmpstat/libsrc/Makefile.dep +++ b/dcmpstat/libsrc/Makefile.dep @@ -34,26 +34,21 @@ dcmpstat.o: dcmpstat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -109,11 +104,14 @@ dcmpstat.o: dcmpstat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dvpsovl.h \ ../include/dcmtk/dcmpstat/dpdefine.h ../include/dcmtk/dcmpstat/dvpsgll.h \ @@ -166,19 +164,6 @@ dviface.o: dviface.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dpdefine.h \ @@ -186,10 +171,18 @@ dviface.o: dviface.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -245,11 +238,14 @@ dviface.o: dviface.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -262,6 +258,7 @@ dviface.o: dviface.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofalign.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -321,6 +318,7 @@ dviface.o: dviface.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../../dcmsr/include/dcmtk/dcmsr/dsrdoctn.h \ ../../dcmsr/include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../dcmsr/include/dcmtk/dcmsr/dsrdncsr.h \ ../../dcmsr/include/dcmtk/dcmsr/dsrdnflt.h \ ../../dcmsr/include/dcmtk/dcmsr/dsritcsr.h \ @@ -410,14 +408,9 @@ dvpsab.o: dvpsab.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -481,14 +474,9 @@ dvpsabl.o: dvpsabl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -551,14 +539,9 @@ dvpsal.o: dvpsal.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -613,15 +596,10 @@ dvpsall.o: dvpsall.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -685,11 +663,14 @@ dvpsall.o: dvpsall.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsgl.h dvpscf.o: dvpscf.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -726,25 +707,18 @@ dvpscf.o: dvpscf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dpdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmpstat/dvpsdef.h + ../include/dcmtk/dcmpstat/dvpsdef.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h dvpscu.o: dvpscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmpstat/dvpscu.h ../include/dcmtk/dcmpstat/dvpstyp.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ @@ -781,27 +755,22 @@ dvpscu.o: dvpscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -857,11 +826,14 @@ dvpscu.o: dvpscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h dvpscul.o: dvpscul.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -907,15 +879,10 @@ dvpscul.o: dvpscul.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -968,20 +935,15 @@ dvpsda.o: dvpsda.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1037,11 +999,14 @@ dvpsda.o: dvpsda.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsril.h ../include/dcmtk/dcmpstat/dvpstyp.h \ ../include/dcmtk/dcmpstat/dpdefine.h ../include/dcmtk/dcmpstat/dvpsri.h \ @@ -1091,15 +1056,10 @@ dvpsdal.o: dvpsdal.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1160,11 +1120,14 @@ dvpsdal.o: dvpsdal.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsril.h ../include/dcmtk/dcmpstat/dvpsri.h dvpsfs.o: dvpsfs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1204,26 +1167,21 @@ dvpsfs.o: dvpsfs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1279,15 +1237,19 @@ dvpsfs.o: dvpsfs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -1354,24 +1316,13 @@ dvpsga.o: dvpsga.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -1379,6 +1330,12 @@ dvpsga.o: dvpsga.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../include/dcmtk/dcmpstat/dvpstxl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmpstat/dpdefine.h ../include/dcmtk/dcmpstat/dvpsgrl.h \ @@ -1433,11 +1390,14 @@ dvpsga.o: dvpsga.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsgr.h dvpsgal.o: dvpsgal.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1483,15 +1443,10 @@ dvpsgal.o: dvpsgal.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1555,11 +1510,14 @@ dvpsgal.o: dvpsgal.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsgr.h ../include/dcmtk/dcmpstat/dvpsri.h dvpsgl.o: dvpsgl.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1598,26 +1556,21 @@ dvpsgl.o: dvpsgl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1673,11 +1626,14 @@ dvpsgl.o: dvpsgl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dpdefine.h ../include/dcmtk/dcmpstat/dvpsdef.h dvpsgll.o: dvpsgll.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1723,15 +1679,10 @@ dvpsgll.o: dvpsgll.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -1792,11 +1743,14 @@ dvpsgll.o: dvpsgll.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsdef.h ../include/dcmtk/dcmpstat/dvpsgal.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -1840,26 +1794,21 @@ dvpsgr.o: dvpsgr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1915,11 +1864,14 @@ dvpsgr.o: dvpsgr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dpdefine.h \ ../include/dcmtk/dcmpstat/dvpsdef.h @@ -1966,15 +1918,10 @@ dvpsgrl.o: dvpsgrl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2035,11 +1982,14 @@ dvpsgrl.o: dvpsgrl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpstyp.h dvpshlp.o: dvpshlp.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2092,11 +2042,6 @@ dvpshlp.o: dvpshlp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2157,11 +2102,14 @@ dvpshlp.o: dvpshlp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h dvpsib.o: dvpsib.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ @@ -2207,15 +2155,10 @@ dvpsib.o: dvpsib.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2275,15 +2218,19 @@ dvpsib.o: dvpsib.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -2340,15 +2287,10 @@ dvpsibl.o: dvpsibl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2409,15 +2351,19 @@ dvpsibl.o: dvpsibl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -2466,29 +2412,23 @@ dvpsmsg.o: dvpsmsg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmnet/include/dcmtk/dcmnet/dcmtrans.h \ ../../dcmnet/include/dcmtk/dcmnet/dcmlayer.h \ ../../dcmnet/include/dcmtk/dcmnet/dntypes.h \ - ../../ofstd/include/dcmtk/ofstd/ofsockad.h + ../../ofstd/include/dcmtk/ofstd/ofsockad.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h dvpsov.o: dvpsov.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmpstat/dvpsov.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ @@ -2525,26 +2465,21 @@ dvpsov.o: dvpsov.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2600,11 +2535,14 @@ dvpsov.o: dvpsov.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dpdefine.h ../include/dcmtk/dcmpstat/dvpsdef.h dvpsovl.o: dvpsovl.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2650,15 +2588,10 @@ dvpsovl.o: dvpsovl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -2719,11 +2652,14 @@ dvpsovl.o: dvpsovl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h dvpspl.o: dvpspl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ @@ -2776,11 +2712,6 @@ dvpspl.o: dvpspl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ @@ -2797,6 +2728,7 @@ dvpspl.o: dvpspl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -2855,17 +2787,6 @@ dvpspl2.o: dvpspl2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2878,6 +2799,12 @@ dvpspl2.o: dvpspl2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmimgle/include/dcmtk/dcmimgle/dimoimg.h \ ../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfcache.h \ @@ -2899,6 +2826,7 @@ dvpspl2.o: dvpspl2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -2958,15 +2886,6 @@ dvpspll.o: dvpspll.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ @@ -2977,6 +2896,11 @@ dvpspll.o: dvpspll.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -3043,11 +2967,14 @@ dvpspll.o: dvpspll.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h dvpspr.o: dvpspr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ @@ -3089,17 +3016,12 @@ dvpspr.o: dvpspr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmpstat/dvpspr.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ @@ -3116,6 +3038,7 @@ dvpspr.o: dvpspr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -3173,15 +3096,6 @@ dvpsprt.o: dvpsprt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ @@ -3192,6 +3106,11 @@ dvpsprt.o: dvpsprt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -3253,11 +3172,14 @@ dvpsprt.o: dvpsprt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -3332,14 +3254,9 @@ dvpsri.o: dvpsri.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -3404,11 +3321,6 @@ dvpsril.o: dvpsril.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ @@ -3472,14 +3384,9 @@ dvpsrs.o: dvpsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -3547,11 +3454,6 @@ dvpsrsl.o: dvpsrsl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ @@ -3618,15 +3520,6 @@ dvpssp.o: dvpssp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ @@ -3637,6 +3530,11 @@ dvpssp.o: dvpssp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -3697,11 +3595,14 @@ dvpssp.o: dvpssp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -3784,16 +3685,6 @@ dvpsspl.o: dvpsspl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3803,6 +3694,7 @@ dvpsspl.o: dvpsspl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -3815,6 +3707,11 @@ dvpsspl.o: dvpsspl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmpstat/dvpssp.h ../include/dcmtk/dcmpstat/dvpspll.h \ @@ -3865,11 +3762,14 @@ dvpsspl.o: dvpsspl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpsovl.h ../include/dcmtk/dcmpstat/dvpsgll.h \ ../include/dcmtk/dcmpstat/dvpsrsl.h ../include/dcmtk/dcmpstat/dvpsall.h \ @@ -3949,11 +3849,6 @@ dvpssv.o: dvpssv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ @@ -4026,11 +3921,6 @@ dvpssvl.o: dvpssvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ @@ -4085,26 +3975,21 @@ dvpstat.o: dvpstat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4160,11 +4045,14 @@ dvpstat.o: dvpstat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dvpsovl.h \ ../include/dcmtk/dcmpstat/dpdefine.h ../include/dcmtk/dcmpstat/dvpsgll.h \ @@ -4235,26 +4123,21 @@ dvpstx.o: dvpstx.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4310,11 +4193,14 @@ dvpstx.o: dvpstx.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpstyp.h ../include/dcmtk/dcmpstat/dpdefine.h \ ../include/dcmtk/dcmpstat/dvpsdef.h @@ -4361,15 +4247,10 @@ dvpstxl.o: dvpstxl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -4430,11 +4311,14 @@ dvpstxl.o: dvpstxl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpstyp.h dvpsvl.o: dvpsvl.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -4474,26 +4358,21 @@ dvpsvl.o: dvpsvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4549,11 +4428,14 @@ dvpsvl.o: dvpsvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmpstat/dvpssv.h ../include/dcmtk/dcmpstat/dvpsril.h \ ../include/dcmtk/dcmpstat/dvpsdef.h ../include/dcmtk/dcmpstat/dvpsri.h @@ -4600,15 +4482,10 @@ dvpsvll.o: dvpsvll.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -4669,11 +4546,14 @@ dvpsvll.o: dvpsvll.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h dvpsvw.o: dvpsvw.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmpstat/dvpsvw.h ../include/dcmtk/dcmpstat/dpdefine.h \ @@ -4714,23 +4594,18 @@ dvpsvw.o: dvpsvw.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4786,11 +4661,14 @@ dvpsvw.o: dvpsvw.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h dvpsvwl.o: dvpsvwl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ @@ -4832,23 +4710,12 @@ dvpsvwl.o: dvpsvwl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -4856,6 +4723,12 @@ dvpsvwl.o: dvpsvwl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \ ../include/dcmtk/dcmpstat/dvpsvwl.h ../include/dcmtk/dcmpstat/dpdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmpstat/dvpsvw.h ../include/dcmtk/dcmpstat/dvpsdef.h @@ -4897,18 +4770,6 @@ dvsighdl.o: dvsighdl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmsign/include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4919,10 +4780,17 @@ dvsighdl.o: dvsighdl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ diff --git a/dcmpstat/libsrc/dviface.cc b/dcmpstat/libsrc/dviface.cc index e3392aed..43c1bf5d 100644 --- a/dcmpstat/libsrc/dviface.cc +++ b/dcmpstat/libsrc/dviface.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -2223,7 +2223,7 @@ OFCondition DVInterface::sendIOD(const char * targetID, } else { // we are the child process if (execl(sender_application, sender_application, configPath.c_str(), - targetID, studyUID, seriesUID, instanceUID, NULL) < 0) + targetID, studyUID, seriesUID, instanceUID, OFreinterpret_cast(char *, 0)) < 0) { DCMPSTAT_ERROR("Unable to execute '" << sender_application << "'"); } @@ -2286,7 +2286,7 @@ OFCondition DVInterface::startReceiver() // we are the parent process, continue loop } else { // we are the child process - if (execl(receiver_application, receiver_application, configPath.c_str(), getTargetID(i, DVPSE_receiver), NULL) < 0) + if (execl(receiver_application, receiver_application, configPath.c_str(), getTargetID(i, DVPSE_receiver), OFreinterpret_cast(char *, 0)) < 0) { DCMPSTAT_ERROR("Unable to execute '" << receiver_application << "'"); } @@ -2341,7 +2341,7 @@ OFCondition DVInterface::terminateReceiver() // we are the parent process, continue loop } else { // we are the child process - if (execl(receiver_application, receiver_application, configPath.c_str(), "--terminate", NULL) < 0) + if (execl(receiver_application, receiver_application, configPath.c_str(), "--terminate", OFreinterpret_cast(char *, 0)) < 0) { DCMPSTAT_ERROR("Unable to execute '" << receiver_application << "'"); } @@ -2409,11 +2409,11 @@ OFCondition DVInterface::startQueryRetrieveServer() char str_timeout[20]; sprintf(str_timeout, "%lu", OFstatic_cast(unsigned long, timeout)); execl(server_application, server_application, "-c", config_filename.c_str(), "--allow-shutdown", - "--timeout", str_timeout, NULL); + "--timeout", str_timeout, OFreinterpret_cast(char *, 0)); } else { - execl(server_application, server_application, "-c", config_filename.c_str(), "--allow-shutdown", NULL); + execl(server_application, server_application, "-c", config_filename.c_str(), "--allow-shutdown", OFreinterpret_cast(char *, 0)); } DCMPSTAT_ERROR("Unable to execute '" << server_application << "'"); @@ -3412,13 +3412,13 @@ OFCondition DVInterface::startPrintSpooler() if (detailedLog) { if (execl(spooler_application, spooler_application, "--verbose", "--dump", "--spool", printJobIdentifier.c_str(), - "--printer", printer, "--config", configPath.c_str(), "--sleep", sleepStr, NULL) < 0) + "--printer", printer, "--config", configPath.c_str(), "--sleep", sleepStr, OFreinterpret_cast(char *, 0)) < 0) { DCMPSTAT_ERROR("Unable to execute '" << spooler_application << "'"); } } else { if (execl(spooler_application, spooler_application, "--spool", printJobIdentifier.c_str(), - "--printer", printer, "--config", configPath.c_str(), "--sleep", sleepStr, NULL) < 0) + "--printer", printer, "--config", configPath.c_str(), "--sleep", sleepStr, OFreinterpret_cast(char *, 0)) < 0) { DCMPSTAT_ERROR("Unable to execute '" << spooler_application << "'"); } @@ -3548,12 +3548,12 @@ OFCondition DVInterface::startPrintServer() if (detailedLog) { if (execl(application, application, "--logfile", "--verbose", "--dump", "--printer", printer, "--config", - configPath.c_str(), NULL) < 0) + configPath.c_str(), OFreinterpret_cast(char *, 0)) < 0) { DCMPSTAT_ERROR("Unable to execute '" << application << "'"); } } else { - if (execl(application, application, "--logfile", "--printer", printer, "--config", configPath.c_str(), NULL) < 0) + if (execl(application, application, "--logfile", "--printer", printer, "--config", configPath.c_str(), OFreinterpret_cast(char *, 0)) < 0) { DCMPSTAT_ERROR("Unable to execute '" << application << "'"); } @@ -3686,6 +3686,7 @@ OFCondition DVInterface::terminatePrintServer() if (profileNamePtr) profileName = profileNamePtr; DcmTLSSecurityProfile tlsProfile = TSP_Profile_BCP195; // default if (profileName == "BCP195-ND") tlsProfile = TSP_Profile_BCP195_ND; + else if (profileName == "BCP195-EX") tlsProfile = TSP_Profile_BCP195_Extended; else if (profileName == "BCP195") tlsProfile = TSP_Profile_BCP195; else if (profileName == "AES") tlsProfile = TSP_Profile_AES; else if (profileName == "BASIC") tlsProfile = TSP_Profile_Basic; @@ -3908,7 +3909,7 @@ OFCondition DVInterface::startExternalApplication(const char *application, const else { // we are the child process - if (execl(application, application, filename, NULL) < 0) + if (execl(application, application, filename, OFreinterpret_cast(char *, 0)) < 0) { DCMPSTAT_ERROR("Unable to execute '" << application << "'"); } diff --git a/dcmpstat/libsrc/dvpsall.cc b/dcmpstat/libsrc/dvpsall.cc index c39f06e6..826e025c 100644 --- a/dcmpstat/libsrc/dvpsall.cc +++ b/dcmpstat/libsrc/dvpsall.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -367,7 +367,8 @@ void DVPSOverlayCurveActivationLayer_PList::renameLayer(const char *oldName, con OFListIterator(DVPSOverlayCurveActivationLayer *) last = list_.end(); while (first != last) { - if (aString == (*first)->getActivationLayer()) + const char *activationLayer = (*first)->getActivationLayer(); + if (activationLayer && (aString == activationLayer)) { (*first)->setActivationLayer(newName); } @@ -385,7 +386,8 @@ void DVPSOverlayCurveActivationLayer_PList::removeLayer(const char *name) OFListIterator(DVPSOverlayCurveActivationLayer *) last = list_.end(); while (first != last) { - if (aString == (*first)->getActivationLayer()) + const char *activationLayer = (*first)->getActivationLayer(); + if (activationLayer && (aString == activationLayer)) { delete (*first); first = list_.erase(first); @@ -403,7 +405,8 @@ OFBool DVPSOverlayCurveActivationLayer_PList::usesLayerName(const char *name) OFListIterator(DVPSOverlayCurveActivationLayer *) last = list_.end(); while (first != last) { - if (aString == (*first)->getActivationLayer()) return OFTrue; + const char *activationLayer = (*first)->getActivationLayer(); + if (activationLayer && (aString == activationLayer)) return OFTrue; ++first; } return OFFalse; @@ -420,7 +423,8 @@ size_t DVPSOverlayCurveActivationLayer_PList::getNumberOfActivations(const char OFListIterator(DVPSOverlayCurveActivationLayer *) last = list_.end(); while (first != last) { - if (aString == (*first)->getActivationLayer()) + const char *activationLayer = (*first)->getActivationLayer(); + if (activationLayer && (aString == activationLayer)) { group = (*first)->getRepeatingGroup(); if (((isCurve) && (group < 0x6000)) || ((!isCurve) && (group >= 0x6000))) result++; @@ -441,12 +445,13 @@ Uint16 DVPSOverlayCurveActivationLayer_PList::getActivationGroup(const char *lay OFListIterator(DVPSOverlayCurveActivationLayer *) last = list_.end(); while (first != last) { - if (aString == (*first)->getActivationLayer()) + const char *activationLayer = (*first)->getActivationLayer(); + if (activationLayer && (aString == activationLayer)) { group = (*first)->getRepeatingGroup(); if (((isCurve) && (group < 0x6000)) || ((!isCurve) && (group >= 0x6000))) { - if (idx==0) return group; else idx--; + if (idx==0) return group; else idx--; } } ++first; diff --git a/dcmpstat/libsrc/dvpssp.cc b/dcmpstat/libsrc/dvpssp.cc index 780289c7..c13c73d6 100644 --- a/dcmpstat/libsrc/dvpssp.cc +++ b/dcmpstat/libsrc/dvpssp.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -30,7 +30,7 @@ #include "dcmtk/dcmimgle/dcmimage.h" #include "dcmtk/dcmimgle/digsdfn.h" #include "dcmtk/dcmpstat/dvpscf.h" - +#include "dcmtk/dcmnet/dimse.h" /* for DICOM_WARNING_STATUS */ #include "dcmtk/dcmpstat/dvpsov.h" /* for DVPSOverlay, needed by MSVC5 with STL */ #include "dcmtk/dcmpstat/dvpsgl.h" /* for DVPSGraphicLayer, needed by MSVC5 with STL */ #include "dcmtk/dcmpstat/dvpsrs.h" /* for DVPSReferencedSeries, needed by MSVC5 with STL */ @@ -50,6 +50,10 @@ #define INCLUDE_CTIME #include "dcmtk/ofstd/ofstdinc.h" +#define DIMSE_STATUS_OK(status) (((status) == 0) || DICOM_WARNING_STATUS(status)) +#define DIMSE_STATUS_BAD(status) (((status) != 0) && !(DICOM_WARNING_STATUS(status))) + + /* --------------- class DVPSStoredPrint --------------- */ DVPSStoredPrint::DVPSStoredPrint(Uint16 illumin, Uint16 reflection, const char *aetitle) @@ -1332,7 +1336,7 @@ OFCondition DVPSStoredPrint::printSCUpreparePresentationLUT( if (result==EC_Normal) { OFCondition cond = printHandler.createRQ(UID_PresentationLUTSOPClass, presentationLUTInstanceUID, &dset, status, attributeListOut); - if ((cond.good())&&((status==0)||((status & 0xf000)==0xb000))) + if (cond.good() && DIMSE_STATUS_OK(status)) { /* nothing */ } else { @@ -1430,7 +1434,7 @@ OFCondition DVPSStoredPrint::printSCUcreateBasicFilmSession( if (result==EC_Normal) { OFCondition cond = printHandler.createRQ(UID_BasicFilmSessionSOPClass, filmSessionInstanceUID, &dset, status, attributeListOut); - if ((cond.bad())||((status!=0)&&((status & 0xf000)!=0xb000))) + if (cond.bad() || DIMSE_STATUS_BAD(status)) { result = EC_IllegalCall; filmSessionInstanceUID.clear(); @@ -1517,7 +1521,7 @@ OFCondition DVPSStoredPrint::printSCUcreateBasicFilmBox(DVPSPrintMessageHandler& size_t numItems = 0; size_t i; OFCondition cond = printHandler.createRQ(UID_BasicFilmBoxSOPClass, filmBoxInstanceUID, &dset, status, attributeListOut); - if ((cond.good())&&((status==0)||((status & 0xf000)==0xb000))&& attributeListOut) + if (cond.good() && DIMSE_STATUS_OK(status) && attributeListOut) { // N-CREATE was successful, now evaluate Referenced Image Box SQ stack.clear(); @@ -1583,7 +1587,7 @@ OFCondition DVPSStoredPrint::printSCUprintBasicFilmBox(DVPSPrintMessageHandler& 1 /* action type ID 1 = print */, NULL /* no action information */, status, attributeListOut); delete attributeListOut; // should be empty anyway - if ((cond.good())&&((status==0)||((status & 0xf000)==0xb000))) return EC_Normal; + if (cond.good() && DIMSE_STATUS_OK(status)) return EC_Normal; return EC_IllegalCall; // otherwise } @@ -1596,7 +1600,7 @@ OFCondition DVPSStoredPrint::printSCUprintBasicFilmSession(DVPSPrintMessageHandl 1 /* action type ID 1 = print */, NULL /* no action information */, status, attributeListOut); delete attributeListOut; // should be empty anyway - if ((cond.good())&&((status==0)||((status & 0xf000)==0xb000))) return EC_Normal; + if (cond.good() && DIMSE_STATUS_OK(status)) return EC_Normal; return EC_IllegalCall; // otherwise } @@ -1610,7 +1614,7 @@ OFCondition DVPSStoredPrint::printSCUdelete(DVPSPrintMessageHandler& printHandle if (filmBoxInstanceUID.size() > 0) { cond = printHandler.deleteRQ(UID_BasicFilmBoxSOPClass, filmBoxInstanceUID.c_str(), status); - if ((cond.bad())||((status!=0)&&((status & 0xf000)!=0xb000))) result = EC_IllegalCall; + if (cond.bad() || DIMSE_STATUS_BAD(status)) result = EC_IllegalCall; filmBoxInstanceUID.clear(); } @@ -1618,7 +1622,7 @@ OFCondition DVPSStoredPrint::printSCUdelete(DVPSPrintMessageHandler& printHandle if (filmSessionInstanceUID.size() > 0) { cond = printHandler.deleteRQ(UID_BasicFilmSessionSOPClass, filmSessionInstanceUID.c_str(), status); - if ((cond.bad())||((status!=0)&&((status & 0xf000)!=0xb000))) result = EC_IllegalCall; + if (cond.bad() || DIMSE_STATUS_BAD(status)) result = EC_IllegalCall; filmSessionInstanceUID.clear(); } @@ -1626,7 +1630,7 @@ OFCondition DVPSStoredPrint::printSCUdelete(DVPSPrintMessageHandler& printHandle if ((presentationLUTInstanceUID.size() > 0)&&(printHandler.printerSupportsPresentationLUT())) { cond = printHandler.deleteRQ(UID_PresentationLUTSOPClass, presentationLUTInstanceUID.c_str(), status); - if ((cond.bad())||((status!=0)&&((status & 0xf000)!=0xb000))) result = EC_IllegalCall; + if (cond.bad() || DIMSE_STATUS_BAD(status)) result = EC_IllegalCall; presentationLUTInstanceUID.clear(); } return result; @@ -1757,7 +1761,7 @@ OFCondition DVPSStoredPrint::printSCUsetBasicImageBox( if (EC_Normal == result) { OFCondition cond = printHandler.setRQ(UID_BasicGrayscaleImageBoxSOPClass, imageSopInstanceUID, &dataset, status, attributeListOut); - if ((cond.bad())||((status!=0)&&((status & 0xf000)!=0xb000))) result = EC_IllegalCall; + if (cond.bad() || DIMSE_STATUS_BAD(status)) result = EC_IllegalCall; } delete attributeListOut; return result; @@ -1786,7 +1790,7 @@ OFCondition DVPSStoredPrint::printSCUsetBasicAnnotationBox( if (EC_Normal == result) { OFCondition cond = printHandler.setRQ(UID_BasicAnnotationBoxSOPClass, annotationSopInstanceUID, &dataset, status, attributeListOut); - if ((cond.bad())||((status!=0)&&((status & 0xf000)!=0xb000))) result = EC_IllegalCall; + if (cond.bad() || DIMSE_STATUS_BAD(status)) result = EC_IllegalCall; } delete attributeListOut; } else { diff --git a/dcmpstat/tests/Makefile.dep b/dcmpstat/tests/Makefile.dep index 7ff6502c..35485ec7 100644 --- a/dcmpstat/tests/Makefile.dep +++ b/dcmpstat/tests/Makefile.dep @@ -33,6 +33,8 @@ msgserv.o: msgserv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ @@ -46,8 +48,6 @@ msgserv.o: msgserv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ - ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmnet/include/dcmtk/dcmnet/dcmtrans.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/dcmlayer.h \ diff --git a/dcmqrdb/apps/Makefile.dep b/dcmqrdb/apps/Makefile.dep index 9b1de252..9bb15d23 100644 --- a/dcmqrdb/apps/Makefile.dep +++ b/dcmqrdb/apps/Makefile.dep @@ -218,19 +218,10 @@ dcmqrti.o: dcmqrti.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -239,6 +230,11 @@ dcmqrti.o: dcmqrti.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -247,7 +243,11 @@ dcmqrti.o: dcmqrti.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmqrdb/dcmqrcnf.h ../include/dcmtk/dcmqrdb/qrdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ - ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h + ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h diff --git a/dcmqrdb/apps/dcmqrscp.cc b/dcmqrdb/apps/dcmqrscp.cc index 36cad869..591fb1ff 100644 --- a/dcmqrdb/apps/dcmqrscp.cc +++ b/dcmqrdb/apps/dcmqrscp.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1993-2018, OFFIS e.V. + * Copyright (C) 1993-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -555,7 +555,7 @@ main(int argc, char *argv[]) app.checkValue(cmd.getValue(options.outgoingProfile)); // read configuration file - OFCondition cond = DcmAssociationConfigurationFile::initialize(asccfg, options.associationConfigFile.c_str()); + cond = DcmAssociationConfigurationFile::initialize(asccfg, options.associationConfigFile.c_str()); if (cond.bad()) { OFLOG_FATAL(dcmqrscpLogger, "cannot read association config file: " << cond.text()); @@ -855,45 +855,45 @@ main(int argc, char *argv[]) return 10; } - /* drop root privileges now and revert to the calling user id (if we are running as setuid root) */ - if (OFStandard::dropPrivileges().bad()) - { + /* drop root privileges now and revert to the calling user id (if we are running as setuid root) */ + if (OFStandard::dropPrivileges().bad()) + { OFLOG_FATAL(dcmqrscpLogger, "setuid() failed, maximum number of processes/threads for uid already running."); return 10; - } + } #if defined(HAVE_SETUID) && defined(HAVE_GRP_H) && defined(HAVE_PWD_H) - OFStandard::OFGroup grp; - OFStandard::OFPasswd pwd; - const char *opt_UserName = NULL; - const char *opt_GroupName = NULL; - - if (((opt_GroupName = config.getGroupName()) != NULL) && strlen(opt_GroupName) > 0) - { - if (!(grp = OFStandard::getGrNam(opt_GroupName))) - { - OFLOG_FATAL(dcmqrscpLogger, "bad group name " << opt_GroupName); - return 10; - } - if (setgid(grp.gr_gid) == -1) - { - OFLOG_FATAL(dcmqrscpLogger, "setgid: Unable to set group id to group " << (unsigned)grp.gr_gid); - return 10; - } - } - if (((opt_UserName = config.getUserName()) != NULL) && strlen(opt_UserName) > 0) - { - if (!(pwd = OFStandard::getPwNam(opt_UserName))) - { - OFLOG_FATAL(dcmqrscpLogger, "bad user name " << opt_UserName); - return 10; - } - if (setuid(pwd.pw_uid) == -1) - { - OFLOG_FATAL(dcmqrscpLogger, "setuid: Unable to set user id to user " << (unsigned)pwd.pw_uid); - return 10; - } - } + OFStandard::OFGroup grp; + OFStandard::OFPasswd pwd; + const char *opt_UserName = NULL; + const char *opt_GroupName = NULL; + + if (((opt_GroupName = config.getGroupName()) != NULL) && strlen(opt_GroupName) > 0) + { + if (!(grp = OFStandard::getGrNam(opt_GroupName))) + { + OFLOG_FATAL(dcmqrscpLogger, "bad group name " << opt_GroupName); + return 10; + } + if (setgid(grp.gr_gid) == -1) + { + OFLOG_FATAL(dcmqrscpLogger, "setgid: Unable to set group id to group " << (unsigned)grp.gr_gid); + return 10; + } + } + if (((opt_UserName = config.getUserName()) != NULL) && strlen(opt_UserName) > 0) + { + if (!(pwd = OFStandard::getPwNam(opt_UserName))) + { + OFLOG_FATAL(dcmqrscpLogger, "bad user name " << opt_UserName); + return 10; + } + if (setuid(pwd.pw_uid) == -1) + { + OFLOG_FATAL(dcmqrscpLogger, "setuid: Unable to set user id to user " << (unsigned)pwd.pw_uid); + return 10; + } + } #endif // defined(HAVE_SETUID) && defined(HAVE_GRP_H) && defined(HAVE_PWD_H) #ifdef WITH_SQL_DATABASE diff --git a/dcmqrdb/docs/dcmqrscp.man b/dcmqrdb/docs/dcmqrscp.man index 2e7192fc..b932a235 100644 --- a/dcmqrdb/docs/dcmqrscp.man +++ b/dcmqrdb/docs/dcmqrscp.man @@ -848,6 +848,8 @@ ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88. AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1 EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1 EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2 @@ -867,6 +869,10 @@ RTBrachyTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481 RTTreatmentSummaryRecordStorage 1.2.840.10008.5.1.4.1.1.481.7 RTIonPlanStorage 1.2.840.10008.5.1.4.1.1.481.8 RTIonBeamsTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481.9 +RTPhysicianIntentStorage 1.2.840.10008.5.1.4.1.1.481.10 +RTSegmentAnnotationStorage 1.2.840.10008.5.1.4.1.1.481.11 +RTRadiationSetStorage 1.2.840.10008.5.1.4.1.1.481.12 +CArmPhotonElectronRadiationStorage 1.2.840.10008.5.1.4.1.1.481.13 DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501.1 DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1 DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2 @@ -1071,6 +1077,6 @@ It is an error if no data dictionary can be loaded. \section dcmqrscp_copyright COPYRIGHT -Copyright (C) 1993-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 1993-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmqrdb/etc/dcmqrprf.cfg b/dcmqrdb/etc/dcmqrprf.cfg index 33e489be..881db973 100644 --- a/dcmqrdb/etc/dcmqrprf.cfg +++ b/dcmqrdb/etc/dcmqrprf.cfg @@ -1,5 +1,5 @@ # -# Copyright (C) 2017-2018, OFFIS e.V. +# Copyright (C) 2017-2019, OFFIS e.V. # All rights reserved. See COPYRIGHT file for details. # # This software and supporting documentation were developed by @@ -233,6 +233,7 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib # - AdvancedBlendingPresentationStateStorage # - BreastProjectionXRayImageStorageForPresentation # - BreastProjectionXRayImageStorageForProcessing +# - CArmPhotonElectronRadiationStorage # - ColorPaletteStorage # - CompositingPlanarMPRVolumetricPresentationStateStorage # - ContentAssessmentResultsStorage @@ -250,8 +251,13 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib # - OphthalmicOpticalCoherenceTomographyEnFaceImageStorage # - ParametricMapStorage # - PatientRadiationDoseSRStorage +# - PerformedImagingAgentAdministrationSRStorage +# - PlannedImagingAgentAdministrationSRStorage # - RadiopharmaceuticalRadiationDoseSRStorage # - RTBrachyApplicationSetupDeliveryInstructionStorage +# - RTPhysicianIntentStorage +# - RTRadiationSetStorage +# - RTSegmentAnnotationStorage # - SegmentedVolumeRenderingVolumetricPresentationStateStorage # - SimplifiedAdultEchoSRStorage # - TractographyResultsStorage @@ -417,13 +423,19 @@ PresentationContext128 = XRayRadiationDoseSRStorage\UncompressedOrZlib # the following SOP classes are missing in the above list: # # - AdvancedBlendingPresentationStateStorage +# - CArmPhotonElectronRadiationStorage # - ColorPaletteStorage # - EncapsulatedSTLStorage # - MultipleVolumeRenderingVolumetricPresentationStateStorage # - OphthalmicOpticalCoherenceTomographyBscanVolumeAnalysisStorage # - OphthalmicOpticalCoherenceTomographyEnFaceImageStorage # - PatientRadiationDoseSRStorage +# - PerformedImagingAgentAdministrationSRStorage +# - PlannedImagingAgentAdministrationSRStorage # - ProtocolApprovalStorage +# - RTPhysicianIntentStorage +# - RTRadiationSetStorage +# - RTSegmentAnnotationStorage # - SegmentedVolumeRenderingVolumetricPresentationStateStorage # - VolumeRenderingVolumetricPresentationStateStorage # @@ -614,6 +626,7 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2 # - BreastProjectionXRayImageStorageForPresentation # - BreastProjectionXRayImageStorageForProcessing # - BreastTomosynthesisImageStorage +# - CArmPhotonElectronRadiationStorage # - CompositingPlanarMPRVolumetricPresentationStateStorage # - Comprehensive3DSRStorage # - ContentAssessmentResultsStorage @@ -651,6 +664,8 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2 # - OphthalmicVisualFieldStaticPerimetryMeasurementsStorage # - ParametricMapStorage # - PatientRadiationDoseSRStorage +# - PerformedImagingAgentAdministrationSRStorage +# - PlannedImagingAgentAdministrationSRStorage # - ProtocolApprovalStorage # - RadiopharmaceuticalRadiationDoseSRStorage # - RealWorldValueMappingStorage @@ -659,6 +674,9 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2 # - RTBrachyApplicationSetupDeliveryInstructionStorage # - RTIonBeamsTreatmentRecordStorage # - RTIonPlanStorage +# - RTPhysicianIntentStorage +# - RTRadiationSetStorage +# - RTSegmentAnnotationStorage # - SegmentationStorage # - SegmentedVolumeRenderingVolumetricPresentationStateStorage # - SimplifiedAdultEchoSRStorage @@ -847,6 +865,7 @@ Role127 = DRAFT_WaveformStorage\BOTH # - AdvancedBlendingPresentationStateStorage # - BreastProjectionXRayImageStorageForPresentation # - BreastProjectionXRayImageStorageForProcessing +# - CArmPhotonElectronRadiationStorage # - ColorPaletteStorage # - CompositingPlanarMPRVolumetricPresentationStateStorage # - ContentAssessmentResultsStorage @@ -864,9 +883,14 @@ Role127 = DRAFT_WaveformStorage\BOTH # - OphthalmicOpticalCoherenceTomographyEnFaceImageStorage # - ParametricMapStorage # - PatientRadiationDoseSRStorage +# - PerformedImagingAgentAdministrationSRStorage +# - PlannedImagingAgentAdministrationSRStorage # - ProtocolApprovalStorage # - RadiopharmaceuticalRadiationDoseSRStorage # - RTBrachyApplicationSetupDeliveryInstructionStorage +# - RTPhysicianIntentStorage +# - RTRadiationSetStorage +# - RTSegmentAnnotationStorage # - SegmentedVolumeRenderingVolumetricPresentationStateStorage # - SimplifiedAdultEchoSRStorage # - TractographyResultsStorage @@ -1020,13 +1044,19 @@ Role127 = XRayRadiationDoseSRStorage\BOTH # the following SOP classes are missing in the above list: # # - AdvancedBlendingPresentationStateStorage +# - CArmPhotonElectronRadiationStorage # - ColorPaletteStorage # - EncapsulatedSTLStorage # - MultipleVolumeRenderingVolumetricPresentationStateStorage # - OphthalmicOpticalCoherenceTomographyBscanVolumeAnalysisStorage # - OphthalmicOpticalCoherenceTomographyEnFaceImageStorage # - PatientRadiationDoseSRStorage +# - PerformedImagingAgentAdministrationSRStorage +# - PlannedImagingAgentAdministrationSRStorage # - ProtocolApprovalStorage +# - RTPhysicianIntentStorage +# - RTRadiationSetStorage +# - RTSegmentAnnotationStorage # - SegmentedVolumeRenderingVolumetricPresentationStateStorage # - VolumeRenderingVolumetricPresentationStateStorage # diff --git a/dcmqrdb/libsrc/Makefile.dep b/dcmqrdb/libsrc/Makefile.dep index 6761dde9..157ec139 100644 --- a/dcmqrdb/libsrc/Makefile.dep +++ b/dcmqrdb/libsrc/Makefile.dep @@ -44,18 +44,9 @@ dcmqrcbf.o: dcmqrcbf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -64,6 +55,11 @@ dcmqrcbf.o: dcmqrcbf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -73,8 +69,12 @@ dcmqrcbf.o: dcmqrcbf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmqrdb/qrdefine.h ../include/dcmtk/dcmqrdb/dcmqrcnf.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../include/dcmtk/dcmqrdb/dcmqropt.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -128,18 +128,9 @@ dcmqrcbg.o: dcmqrcbg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -148,6 +139,11 @@ dcmqrcbg.o: dcmqrcbg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -157,8 +153,12 @@ dcmqrcbg.o: dcmqrcbg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmqrdb/qrdefine.h ../include/dcmtk/dcmqrdb/dcmqrcnf.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../include/dcmtk/dcmqrdb/dcmqropt.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -212,18 +212,9 @@ dcmqrcbm.o: dcmqrcbm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -232,6 +223,11 @@ dcmqrcbm.o: dcmqrcbm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -249,8 +245,12 @@ dcmqrcbm.o: dcmqrcbm.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dccfenmp.h \ ../../dcmnet/include/dcmtk/dcmnet/dccfprmp.h \ ../include/dcmtk/dcmqrdb/qrdefine.h ../include/dcmtk/dcmqrdb/dcmqrcnf.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../include/dcmtk/dcmqrdb/dcmqropt.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -304,18 +304,9 @@ dcmqrcbs.o: dcmqrcbs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -324,6 +315,11 @@ dcmqrcbs.o: dcmqrcbs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -333,8 +329,12 @@ dcmqrcbs.o: dcmqrcbs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmqrdb/qrdefine.h ../include/dcmtk/dcmqrdb/dcmqrcnf.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../include/dcmtk/dcmqrdb/dcmqropt.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -387,8 +387,6 @@ dcmqrcnf.o: dcmqrcnf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmqrdb/qrdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h @@ -443,11 +441,6 @@ dcmqrdbi.o: dcmqrdbi.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ @@ -459,6 +452,7 @@ dcmqrdbi.o: dcmqrdbi.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -468,7 +462,12 @@ dcmqrdbi.o: dcmqrdbi.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../ofstd/include/dcmtk/ofstd/offname.h \ - ../include/dcmtk/dcmqrdb/dcmqrcnf.h ../include/dcmtk/dcmqrdb/dcmqropt.h \ + ../include/dcmtk/dcmqrdb/dcmqrcnf.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmqrdb/dcmqropt.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmqrdb/dcmqridx.h \ ../../ofstd/include/dcmtk/ofstd/ofoption.h \ ../../ofstd/include/dcmtk/ofstd/ofalign.h \ @@ -526,15 +525,10 @@ dcmqrdbs.o: dcmqrdbs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -579,36 +573,37 @@ dcmqropt.o: dcmqropt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ ../../dcmnet/include/dcmtk/dcmnet/dcuserid.h \ ../../dcmnet/include/dcmtk/dcmnet/dntypes.h \ - ../include/dcmtk/dcmqrdb/dcmqrcnf.h ../include/dcmtk/dcmqrdb/qrdefine.h \ + ../include/dcmtk/dcmqrdb/dcmqrcnf.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../include/dcmtk/dcmqrdb/qrdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -664,18 +659,9 @@ dcmqrptb.o: dcmqrptb.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -685,6 +671,15 @@ dcmqrptb.o: dcmqrptb.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../include/dcmtk/dcmqrdb/dcmqrcnf.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -740,18 +735,9 @@ dcmqrsrv.o: dcmqrsrv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -760,6 +746,11 @@ dcmqrsrv.o: dcmqrsrv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -778,6 +769,10 @@ dcmqrsrv.o: dcmqrsrv.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dccfprmp.h \ ../include/dcmtk/dcmqrdb/dcmqrptb.h ../include/dcmtk/dcmqrdb/qrdefine.h \ ../include/dcmtk/dcmqrdb/dcmqropt.h ../include/dcmtk/dcmqrdb/dcmqrcnf.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ @@ -831,19 +826,10 @@ dcmqrtis.o: dcmqrtis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -852,6 +838,11 @@ dcmqrtis.o: dcmqrtis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -860,6 +851,8 @@ dcmqrtis.o: dcmqrtis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmqrdb/dcmqrcnf.h ../include/dcmtk/dcmqrdb/qrdefine.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ @@ -869,4 +862,6 @@ dcmqrtis.o: dcmqrtis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ - ../include/dcmtk/dcmqrdb/dcmqropt.h + ../include/dcmtk/dcmqrdb/dcmqropt.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h diff --git a/dcmqrdb/libsrc/dcmqrcbg.cc b/dcmqrdb/libsrc/dcmqrcbg.cc index a7ec702a..ab1c61b9 100644 --- a/dcmqrdb/libsrc/dcmqrcbg.cc +++ b/dcmqrdb/libsrc/dcmqrcbg.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1993-2018, OFFIS e.V. + * Copyright (C) 1993-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -26,6 +26,7 @@ #include "dcmtk/dcmdata/dcdeftag.h" #include "dcmtk/dcmqrdb/dcmqropt.h" #include "dcmtk/dcmnet/diutil.h" +#include "dcmtk/dcmnet/dimse.h" /* for DICOM_WARNING_STATUS */ #include "dcmtk/dcmdata/dcfilefo.h" #include "dcmtk/dcmqrdb/dcmqrdbs.h" #include "dcmtk/dcmqrdb/dcmqrdbi.h" @@ -252,7 +253,7 @@ OFCondition DcmQueryRetrieveGetContext::performGetSubOp(DIC_UI sopClass, DIC_UI if (rsp.DimseStatus == STATUS_Success) { /* everything ok */ nCompleted++; - } else if ((rsp.DimseStatus & 0xf000) == 0xb000) { + } else if (DICOM_WARNING_STATUS(rsp.DimseStatus)) { /* a warning status message */ nWarning++; DCMQRDB_ERROR("Get SCP: Store Warning: Response Status: " << diff --git a/dcmqrdb/libsrc/dcmqrcbm.cc b/dcmqrdb/libsrc/dcmqrcbm.cc index d542db8b..d3e07295 100644 --- a/dcmqrdb/libsrc/dcmqrcbm.cc +++ b/dcmqrdb/libsrc/dcmqrcbm.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1993-2018, OFFIS e.V. + * Copyright (C) 1993-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -27,6 +27,7 @@ #include "dcmtk/dcmdata/dcdeftag.h" #include "dcmtk/dcmqrdb/dcmqropt.h" #include "dcmtk/dcmnet/diutil.h" +#include "dcmtk/dcmnet/dimse.h" /* for DICOM_WARNING_STATUS */ #include "dcmtk/dcmdata/dcfilefo.h" #include "dcmtk/dcmqrdb/dcmqrdbs.h" #include "dcmtk/dcmqrdb/dcmqrdbi.h" @@ -257,7 +258,7 @@ OFCondition DcmQueryRetrieveMoveContext::performMoveSubOp(DIC_UI sopClass, DIC_U if (rsp.DimseStatus == STATUS_Success) { /* everything ok */ nCompleted++; - } else if ((rsp.DimseStatus & 0xf000) == 0xb000) { + } else if (DICOM_WARNING_STATUS(rsp.DimseStatus)) { /* a warning status message */ nWarning++; DCMQRDB_ERROR("Move SCP: Store Warning: Response Status: " << diff --git a/dcmqrdb/libsrc/dcmqrdbi.cc b/dcmqrdb/libsrc/dcmqrdbi.cc index 51abe781..1ef1ec47 100644 --- a/dcmqrdb/libsrc/dcmqrdbi.cc +++ b/dcmqrdb/libsrc/dcmqrdbi.cc @@ -2748,7 +2748,9 @@ OFCondition DcmQueryRetrieveIndexDatabaseHandle::storeRequest ( (strcmp(SOPClassUID, UID_RadiopharmaceuticalRadiationDoseSRStorage) == 0) || (strcmp(SOPClassUID, UID_AcquisitionContextSRStorage) == 0) || (strcmp(SOPClassUID, UID_SimplifiedAdultEchoSRStorage) == 0) || - (strcmp(SOPClassUID, UID_PatientRadiationDoseSRStorage) == 0)) + (strcmp(SOPClassUID, UID_PatientRadiationDoseSRStorage) == 0) || + (strcmp(SOPClassUID, UID_PerformedImagingAgentAdministrationSRStorage) == 0) || + (strcmp(SOPClassUID, UID_PlannedImagingAgentAdministrationSRStorage) == 0)) { OFString string; OFString description = "unknown SR"; diff --git a/dcmrt/apps/Makefile.dep b/dcmrt/apps/Makefile.dep index 90e64b05..cd8283ba 100644 --- a/dcmrt/apps/Makefile.dep +++ b/dcmrt/apps/Makefile.dep @@ -109,11 +109,14 @@ drtdump.o: drtdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ diff --git a/dcmrt/libsrc/Makefile.dep b/dcmrt/libsrc/Makefile.dep index ee5b4dac..754a16d8 100644 --- a/dcmrt/libsrc/Makefile.dep +++ b/dcmrt/libsrc/Makefile.dep @@ -34,18 +34,6 @@ drmdose.o: drmdose.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -54,7 +42,14 @@ drmdose.o: drmdose.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -110,11 +105,14 @@ drmdose.o: drmdose.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -235,18 +233,6 @@ drmimage.o: drmimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -255,7 +241,14 @@ drmimage.o: drmimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -311,11 +304,14 @@ drmimage.o: drmimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -449,18 +445,6 @@ drmplan.o: drmplan.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -469,7 +453,14 @@ drmplan.o: drmplan.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -525,11 +516,14 @@ drmplan.o: drmplan.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtass.h ../include/dcmtk/dcmrt/seq/drtbads.h \ @@ -660,18 +654,6 @@ drmstrct.o: drmstrct.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -680,7 +662,14 @@ drmstrct.o: drmstrct.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -736,11 +725,14 @@ drmstrct.o: drmstrct.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -859,17 +851,6 @@ drtaadcs.o: drtaadcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -878,7 +859,13 @@ drtaadcs.o: drtaadcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -934,11 +921,14 @@ drtaadcs.o: drtaadcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtadcs.o: drtadcs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -978,17 +968,6 @@ drtadcs.o: drtadcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -997,7 +976,13 @@ drtadcs.o: drtadcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1053,11 +1038,14 @@ drtadcs.o: drtadcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtads.o: drtads.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1097,17 +1085,6 @@ drtads.o: drtads.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1116,7 +1093,13 @@ drtads.o: drtads.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1172,11 +1155,14 @@ drtads.o: drtads.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtafs.o: drtafs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1216,17 +1202,6 @@ drtafs.o: drtafs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1235,7 +1210,13 @@ drtafs.o: drtafs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1291,11 +1272,14 @@ drtafs.o: drtafs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtags.o: drtags.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtags.h \ @@ -1334,17 +1318,6 @@ drtags.o: drtags.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1353,7 +1326,13 @@ drtags.o: drtags.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1409,11 +1388,14 @@ drtags.o: drtags.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtajcs.o: drtajcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtajcs.h \ @@ -1452,17 +1434,6 @@ drtajcs.o: drtajcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1471,7 +1442,13 @@ drtajcs.o: drtajcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1527,11 +1504,14 @@ drtajcs.o: drtajcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtas1.o: drtas1.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1571,17 +1551,6 @@ drtas1.o: drtas1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1590,7 +1559,13 @@ drtas1.o: drtas1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1646,11 +1621,14 @@ drtas1.o: drtas1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtags.h drtas5.o: drtas5.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1690,17 +1668,6 @@ drtas5.o: drtas5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1709,7 +1676,13 @@ drtas5.o: drtas5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1765,11 +1738,14 @@ drtas5.o: drtas5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtags.h drtas6.o: drtas6.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1809,17 +1785,6 @@ drtas6.o: drtas6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1828,7 +1793,13 @@ drtas6.o: drtas6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -1884,11 +1855,14 @@ drtas6.o: drtas6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtas7.o: drtas7.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtas7.h \ @@ -1927,17 +1901,6 @@ drtas7.o: drtas7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -1946,7 +1909,13 @@ drtas7.o: drtas7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2002,11 +1971,14 @@ drtas7.o: drtas7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtass.o: drtass.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtass.h \ @@ -2045,17 +2017,6 @@ drtass.o: drtass.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -2064,7 +2025,13 @@ drtass.o: drtass.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2120,11 +2087,14 @@ drtass.o: drtass.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbads.h ../include/dcmtk/dcmrt/seq/drtchs.h \ ../include/dcmtk/dcmrt/seq/drtbcps.h \ @@ -2168,17 +2138,6 @@ drtbads.o: drtbads.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -2187,7 +2146,13 @@ drtbads.o: drtbads.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2243,11 +2208,14 @@ drtbads.o: drtbads.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtbas.o: drtbas.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtbas.h \ @@ -2286,17 +2254,6 @@ drtbas.o: drtbas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -2305,7 +2262,13 @@ drtbas.o: drtbas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2361,11 +2324,14 @@ drtbas.o: drtbas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtbcps.o: drtbcps.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2405,17 +2371,6 @@ drtbcps.o: drtbcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -2424,7 +2379,13 @@ drtbcps.o: drtbcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2480,11 +2441,14 @@ drtbcps.o: drtbcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbrdrs.h drtbl2.o: drtbl2.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2524,17 +2488,6 @@ drtbl2.o: drtbl2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -2543,7 +2496,13 @@ drtbl2.o: drtbl2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2599,11 +2558,14 @@ drtbl2.o: drtbl2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtbl5.o: drtbl5.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtbl5.h \ @@ -2642,17 +2604,6 @@ drtbl5.o: drtbl5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -2661,7 +2612,13 @@ drtbl5.o: drtbl5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2717,11 +2674,14 @@ drtbl5.o: drtbl5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtbldls.o: drtbldls.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtbldls.h \ @@ -2760,17 +2720,6 @@ drtbldls.o: drtbldls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -2779,8 +2728,14 @@ drtbldls.o: drtbldls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -2835,11 +2790,14 @@ drtbldls.o: drtbldls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtbldps.o: drtbldps.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtbldps.h \ @@ -2878,17 +2836,6 @@ drtbldps.o: drtbldps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -2897,7 +2844,13 @@ drtbldps.o: drtbldps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -2953,11 +2906,14 @@ drtbldps.o: drtbldps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtblds1.o: drtblds1.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtblds1.h \ @@ -2996,17 +2952,6 @@ drtblds1.o: drtblds1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3015,7 +2960,13 @@ drtblds1.o: drtblds1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3071,11 +3022,14 @@ drtblds1.o: drtblds1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtblds5.o: drtblds5.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtblds5.h \ @@ -3114,17 +3068,6 @@ drtblds5.o: drtblds5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3133,7 +3076,13 @@ drtblds5.o: drtblds5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3189,11 +3138,14 @@ drtblds5.o: drtblds5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtblds6.o: drtblds6.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtblds6.h \ @@ -3232,17 +3184,6 @@ drtblds6.o: drtblds6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3251,7 +3192,13 @@ drtblds6.o: drtblds6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3307,11 +3254,14 @@ drtblds6.o: drtblds6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtbldts.o: drtbldts.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtbldts.h \ @@ -3350,17 +3300,6 @@ drtbldts.o: drtbldts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3369,7 +3308,13 @@ drtbldts.o: drtbldts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3425,11 +3370,14 @@ drtbldts.o: drtbldts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtbrcss.o: drtbrcss.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtbrcss.h \ @@ -3468,17 +3416,6 @@ drtbrcss.o: drtbrcss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3487,7 +3424,13 @@ drtbrcss.o: drtbrcss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3543,11 +3486,14 @@ drtbrcss.o: drtbrcss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtbrdrs.o: drtbrdrs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -3587,17 +3533,6 @@ drtbrdrs.o: drtbrdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3606,7 +3541,13 @@ drtbrdrs.o: drtbrdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3662,11 +3603,14 @@ drtbrdrs.o: drtbrdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtbrs.o: drtbrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -3705,17 +3649,6 @@ drtbrs.o: drtbrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3724,7 +3657,13 @@ drtbrs.o: drtbrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3780,11 +3719,14 @@ drtbrs.o: drtbrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbrcss.h \ ../include/dcmtk/dcmrt/seq/drtecs.h @@ -3825,17 +3767,6 @@ drtbs.o: drtbs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3844,7 +3775,13 @@ drtbs.o: drtbs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -3900,11 +3837,14 @@ drtbs.o: drtbs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtas1.h ../include/dcmtk/dcmrt/seq/drtags.h \ ../include/dcmtk/dcmrt/seq/drtblds1.h \ @@ -3955,17 +3895,6 @@ drtbss.o: drtbss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -3974,7 +3903,13 @@ drtbss.o: drtbss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4030,11 +3965,14 @@ drtbss.o: drtbss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtbvcps.o: drtbvcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtbvcps.h \ @@ -4073,17 +4011,6 @@ drtbvcps.o: drtbvcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4092,7 +4019,13 @@ drtbvcps.o: drtbvcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4148,11 +4081,14 @@ drtbvcps.o: drtbvcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtcbars.o: drtcbars.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtcbars.h \ @@ -4191,17 +4127,6 @@ drtcbars.o: drtcbars.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4210,7 +4135,13 @@ drtcbars.o: drtcbars.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4266,11 +4197,14 @@ drtcbars.o: drtcbars.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtads.h ../include/dcmtk/dcmrt/seq/drtecs.h drtccs.o: drtccs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -4310,17 +4244,6 @@ drtccs.o: drtccs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4329,7 +4252,13 @@ drtccs.o: drtccs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4385,11 +4314,14 @@ drtccs.o: drtccs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtcctus.o: drtcctus.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -4429,17 +4361,6 @@ drtcctus.o: drtcctus.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4448,7 +4369,13 @@ drtcctus.o: drtcctus.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4504,11 +4431,14 @@ drtcctus.o: drtcctus.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtcdrs.o: drtcdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtcdrs.h \ @@ -4547,17 +4477,6 @@ drtcdrs.o: drtcdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4566,7 +4485,13 @@ drtcdrs.o: drtcdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4622,11 +4547,14 @@ drtcdrs.o: drtcdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtces.o: drtces.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtces.h \ @@ -4665,17 +4593,6 @@ drtces.o: drtces.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4684,7 +4601,13 @@ drtces.o: drtces.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4740,11 +4663,14 @@ drtces.o: drtces.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtois.h ../include/dcmtk/dcmrt/seq/drtics.h \ ../include/dcmtk/dcmrt/seq/drtecs.h ../include/dcmtk/dcmrt/seq/drtpics.h \ @@ -4786,17 +4712,6 @@ drtcgis.o: drtcgis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4805,7 +4720,13 @@ drtcgis.o: drtcgis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4861,11 +4782,14 @@ drtcgis.o: drtcgis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtchs.o: drtchs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtchs.h \ @@ -4904,17 +4828,6 @@ drtchs.o: drtchs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -4923,7 +4836,13 @@ drtchs.o: drtchs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -4979,11 +4898,14 @@ drtchs.o: drtchs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbcps.h \ ../include/dcmtk/dcmrt/seq/drtbrdrs.h \ @@ -5025,17 +4947,6 @@ drtcims.o: drtcims.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -5044,7 +4955,13 @@ drtcims.o: drtcims.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -5100,11 +5017,14 @@ drtcims.o: drtcims.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtccs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtcncs.h \ @@ -5147,17 +5067,6 @@ drtcis.o: drtcis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -5166,7 +5075,13 @@ drtcis.o: drtcis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -5222,11 +5137,14 @@ drtcis.o: drtcis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtcncs.o: drtcncs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtcncs.h \ @@ -5265,17 +5183,6 @@ drtcncs.o: drtcncs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -5284,10 +5191,16 @@ drtcncs.o: drtcncs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ @@ -5340,11 +5253,14 @@ drtcncs.o: drtcncs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtcos.o: drtcos.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -5384,17 +5300,6 @@ drtcos.o: drtcos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -5403,7 +5308,13 @@ drtcos.o: drtcos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -5459,11 +5370,14 @@ drtcos.o: drtcos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtcpas.o: drtcpas.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtcpas.h \ @@ -5502,17 +5416,6 @@ drtcpas.o: drtcpas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -5521,7 +5424,13 @@ drtcpas.o: drtcpas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -5577,11 +5486,14 @@ drtcpas.o: drtcpas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtcpis.o: drtcpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtcpis.h \ @@ -5620,17 +5532,6 @@ drtcpis.o: drtcpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -5639,7 +5540,13 @@ drtcpis.o: drtcpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -5695,11 +5602,14 @@ drtcpis.o: drtcpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtics.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtpics.h @@ -5740,17 +5650,6 @@ drtcps.o: drtcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -5759,7 +5658,13 @@ drtcps.o: drtcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -5815,11 +5720,14 @@ drtcps.o: drtcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbldps.h \ ../include/dcmtk/dcmrt/seq/drtrdrs1.h \ @@ -5862,17 +5770,6 @@ drtcs.o: drtcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -5881,7 +5778,13 @@ drtcs.o: drtcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -5937,11 +5840,14 @@ drtcs.o: drtcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtcis.h drtcsas.o: drtcsas.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -5981,17 +5887,6 @@ drtcsas.o: drtcsas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6000,7 +5895,13 @@ drtcsas.o: drtcsas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -6056,11 +5957,14 @@ drtcsas.o: drtcsas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtcshs.o: drtcshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtcshs.h \ @@ -6099,17 +6003,6 @@ drtcshs.o: drtcshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6118,7 +6011,13 @@ drtcshs.o: drtcshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -6174,11 +6073,14 @@ drtcshs.o: drtcshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtcsis.o: drtcsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtcsis.h \ @@ -6217,17 +6119,6 @@ drtcsis.o: drtcsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6236,7 +6127,13 @@ drtcsis.o: drtcsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -6292,11 +6189,14 @@ drtcsis.o: drtcsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtcsrs.h drtcsrs.o: drtcsrs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -6336,17 +6236,6 @@ drtcsrs.o: drtcsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6355,7 +6244,13 @@ drtcsrs.o: drtcsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -6411,11 +6306,14 @@ drtcsrs.o: drtcsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtcss.o: drtcss.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtcss.h \ @@ -6454,17 +6352,6 @@ drtcss.o: drtcss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6473,7 +6360,13 @@ drtcss.o: drtcss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -6529,11 +6422,14 @@ drtcss.o: drtcss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtdcs.o: drtdcs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -6573,17 +6469,6 @@ drtdcs.o: drtdcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6592,7 +6477,13 @@ drtdcs.o: drtdcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -6648,11 +6539,14 @@ drtdcs.o: drtdcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtdddps.o: drtdddps.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -6692,17 +6586,6 @@ drtdddps.o: drtdddps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6711,7 +6594,13 @@ drtdddps.o: drtdddps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -6767,11 +6656,14 @@ drtdddps.o: drtdddps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtddps.o: drtddps.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtddps.h \ @@ -6810,17 +6702,6 @@ drtddps.o: drtddps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6829,7 +6710,13 @@ drtddps.o: drtddps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -6885,11 +6772,14 @@ drtddps.o: drtddps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtdias.o: drtdias.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtdias.h \ @@ -6928,17 +6818,6 @@ drtdias.o: drtdias.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -6947,7 +6826,13 @@ drtdias.o: drtdias.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -7003,11 +6888,14 @@ drtdias.o: drtdias.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtdimcs.o: drtdimcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtdimcs.h \ @@ -7046,17 +6934,6 @@ drtdimcs.o: drtdimcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -7065,7 +6942,13 @@ drtdimcs.o: drtdimcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -7121,11 +7004,14 @@ drtdimcs.o: drtdimcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtdimrs.o: drtdimrs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -7165,17 +7051,6 @@ drtdimrs.o: drtdimrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -7184,7 +7059,13 @@ drtdimrs.o: drtdimrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -7240,11 +7121,14 @@ drtdimrs.o: drtdimrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtdirs.o: drtdirs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtdirs.h \ @@ -7283,17 +7167,6 @@ drtdirs.o: drtdirs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -7302,7 +7175,13 @@ drtdirs.o: drtdirs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -7358,11 +7237,14 @@ drtdirs.o: drtdirs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtdose.o: drtdose.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/drtdose.h ../include/dcmtk/dcmrt/drttypes.h \ @@ -7399,18 +7281,6 @@ drtdose.o: drtdose.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -7419,7 +7289,14 @@ drtdose.o: drtdose.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -7475,11 +7352,14 @@ drtdose.o: drtdose.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -7600,17 +7480,6 @@ drtdrs.o: drtdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -7619,7 +7488,13 @@ drtdrs.o: drtdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -7675,11 +7550,14 @@ drtdrs.o: drtdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtds.o: drtds.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtds.h \ @@ -7718,17 +7596,6 @@ drtds.o: drtds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -7737,7 +7604,13 @@ drtds.o: drtds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -7793,11 +7666,14 @@ drtds.o: drtds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtdspcs.o: drtdspcs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -7837,17 +7713,6 @@ drtdspcs.o: drtdspcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -7856,7 +7721,13 @@ drtdspcs.o: drtdspcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -7912,11 +7783,14 @@ drtdspcs.o: drtdspcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtdss.o: drtdss.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -7956,17 +7830,6 @@ drtdss.o: drtdss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -7975,7 +7838,13 @@ drtdss.o: drtdss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8031,11 +7900,14 @@ drtdss.o: drtdss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtdspcs.h \ ../include/dcmtk/dcmrt/seq/drtecs.h @@ -8076,17 +7948,6 @@ drtdvhs.o: drtdvhs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -8095,7 +7956,13 @@ drtdvhs.o: drtdvhs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8151,11 +8018,14 @@ drtdvhs.o: drtdvhs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtdvrrs.h drtdvrrs.o: drtdvrrs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -8195,17 +8065,6 @@ drtdvrrs.o: drtdvrrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -8214,7 +8073,13 @@ drtdvrrs.o: drtdvrrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8270,11 +8135,14 @@ drtdvrrs.o: drtdvrrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drteas.o: drteas.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drteas.h \ @@ -8313,17 +8181,6 @@ drteas.o: drteas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -8332,7 +8189,13 @@ drteas.o: drteas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8388,11 +8251,14 @@ drteas.o: drteas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtecs.o: drtecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtecs.h \ @@ -8431,17 +8297,6 @@ drtecs.o: drtecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -8450,7 +8305,13 @@ drtecs.o: drtecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8506,11 +8367,14 @@ drtecs.o: drtecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtes.o: drtes.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtes.h \ @@ -8549,17 +8413,6 @@ drtes.o: drtes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -8568,7 +8421,13 @@ drtes.o: drtes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8624,11 +8483,14 @@ drtes.o: drtes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtas5.h ../include/dcmtk/dcmrt/seq/drtags.h \ ../include/dcmtk/dcmrt/seq/drtblds5.h \ @@ -8671,17 +8533,6 @@ drtfds.o: drtfds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -8690,7 +8541,13 @@ drtfds.o: drtfds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8746,11 +8603,14 @@ drtfds.o: drtfds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtfes.o: drtfes.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtfes.h \ @@ -8789,17 +8649,6 @@ drtfes.o: drtfes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -8808,7 +8657,13 @@ drtfes.o: drtfes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8864,11 +8719,14 @@ drtfes.o: drtfes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtfgs.o: drtfgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtfgs.h \ @@ -8907,17 +8765,6 @@ drtfgs.o: drtfgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -8926,7 +8773,13 @@ drtfgs.o: drtfgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -8982,11 +8835,14 @@ drtfgs.o: drtfgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrbs8.h \ ../include/dcmtk/dcmrt/seq/drtrbas8.h \ @@ -9029,17 +8885,6 @@ drtfgss.o: drtfgss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9048,7 +8893,13 @@ drtfgss.o: drtfgss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -9104,11 +8955,14 @@ drtfgss.o: drtfgss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtfsss.h drtfms.o: drtfms.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -9148,17 +9002,6 @@ drtfms.o: drtfms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9167,7 +9010,13 @@ drtfms.o: drtfms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -9223,11 +9072,14 @@ drtfms.o: drtfms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtfsss.o: drtfsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtfsss.h \ @@ -9266,17 +9118,6 @@ drtfsss.o: drtfsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9285,7 +9126,13 @@ drtfsss.o: drtfsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -9341,11 +9188,14 @@ drtfsss.o: drtfsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtgas.o: drtgas.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtgas.h \ @@ -9384,17 +9234,6 @@ drtgas.o: drtgas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9403,7 +9242,13 @@ drtgas.o: drtgas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -9459,11 +9304,14 @@ drtgas.o: drtgas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtgmcs.o: drtgmcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtgmcs.h \ @@ -9502,17 +9350,6 @@ drtgmcs.o: drtgmcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9521,7 +9358,13 @@ drtgmcs.o: drtgmcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -9577,11 +9420,14 @@ drtgmcs.o: drtgmcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtgms.o: drtgms.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -9621,17 +9467,6 @@ drtgms.o: drtgms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9640,7 +9475,13 @@ drtgms.o: drtgms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -9696,11 +9537,14 @@ drtgms.o: drtgms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtgmcs.h ../include/dcmtk/dcmrt/seq/drtecs.h drtgpis.o: drtgpis.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -9740,17 +9584,6 @@ drtgpis.o: drtgpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9759,7 +9592,13 @@ drtgpis.o: drtgpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -9815,11 +9654,14 @@ drtgpis.o: drtgpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtipiqs.h \ ../include/dcmtk/dcmrt/seq/drtaadcs.h \ @@ -9862,17 +9704,6 @@ drthsdrs.o: drthsdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9881,7 +9712,13 @@ drthsdrs.o: drthsdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -9937,11 +9774,14 @@ drthsdrs.o: drthsdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtiais.o: drtiais.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtiais.h \ @@ -9980,17 +9820,6 @@ drtiais.o: drtiais.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -9999,7 +9828,13 @@ drtiais.o: drtiais.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -10055,11 +9890,14 @@ drtiais.o: drtiais.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtians.o: drtians.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtians.h \ @@ -10098,17 +9936,6 @@ drtians.o: drtians.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -10117,7 +9944,13 @@ drtians.o: drtians.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -10173,11 +10006,14 @@ drtians.o: drtians.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtiblds.o: drtiblds.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtiblds.h \ @@ -10216,17 +10052,6 @@ drtiblds.o: drtiblds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -10235,7 +10060,13 @@ drtiblds.o: drtiblds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -10291,11 +10122,14 @@ drtiblds.o: drtiblds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtibls.o: drtibls.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtibls.h \ @@ -10334,17 +10168,6 @@ drtibls.o: drtibls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -10353,10 +10176,16 @@ drtibls.o: drtibls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ @@ -10409,11 +10238,14 @@ drtibls.o: drtibls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbss.h drtibs.o: drtibs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -10453,17 +10285,6 @@ drtibs.o: drtibs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -10472,7 +10293,13 @@ drtibs.o: drtibs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -10528,11 +10355,14 @@ drtibs.o: drtibs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtas6.h ../include/dcmtk/dcmrt/seq/drtddps.h \ ../include/dcmtk/dcmrt/seq/drtgas.h \ @@ -10589,17 +10419,6 @@ drticpds.o: drticpds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -10608,7 +10427,13 @@ drticpds.o: drticpds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -10664,11 +10489,14 @@ drticpds.o: drticpds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbldps.h \ ../include/dcmtk/dcmrt/seq/drtcpas.h \ @@ -10715,17 +10543,6 @@ drticps.o: drticps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -10734,7 +10551,13 @@ drticps.o: drticps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -10790,11 +10613,14 @@ drticps.o: drticps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbldps.h \ ../include/dcmtk/dcmrt/seq/drtiwps.h \ @@ -10839,17 +10665,6 @@ drtics.o: drtics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -10858,7 +10673,13 @@ drtics.o: drtics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -10914,11 +10735,14 @@ drtics.o: drtics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtiis.o: drtiis.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -10958,17 +10782,6 @@ drtiis.o: drtiis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -10977,7 +10790,13 @@ drtiis.o: drtiis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -11033,11 +10852,14 @@ drtiis.o: drtiis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtimage.o: drtimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/drtimage.h ../include/dcmtk/dcmrt/drttypes.h \ @@ -11074,18 +10896,6 @@ drtimage.o: drtimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -11094,7 +10904,14 @@ drtimage.o: drtimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -11150,11 +10967,14 @@ drtimage.o: drtimage.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -11270,18 +11090,6 @@ drtionpl.o: drtionpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -11290,7 +11098,14 @@ drtionpl.o: drtionpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -11346,11 +11161,14 @@ drtionpl.o: drtionpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -11479,18 +11297,6 @@ drtiontr.o: drtiontr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -11499,7 +11305,14 @@ drtiontr.o: drtiontr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -11555,11 +11368,14 @@ drtiontr.o: drtiontr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -11696,17 +11512,6 @@ drtipiqs.o: drtipiqs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -11715,7 +11520,13 @@ drtipiqs.o: drtipiqs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -11771,11 +11582,14 @@ drtipiqs.o: drtipiqs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtaadcs.h \ ../include/dcmtk/dcmrt/seq/drtecs.h ../include/dcmtk/dcmrt/seq/drtafs.h \ @@ -11817,17 +11631,6 @@ drtircs.o: drtircs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -11836,7 +11639,13 @@ drtircs.o: drtircs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -11892,11 +11701,14 @@ drtircs.o: drtircs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtiseis.o: drtiseis.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtiseis.h \ @@ -11935,17 +11747,6 @@ drtiseis.o: drtiseis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -11954,7 +11755,13 @@ drtiseis.o: drtiseis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12010,11 +11817,14 @@ drtiseis.o: drtiseis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtitts.o: drtitts.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtitts.h \ @@ -12053,17 +11863,6 @@ drtitts.o: drtitts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -12072,7 +11871,13 @@ drtitts.o: drtitts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12128,11 +11933,14 @@ drtitts.o: drtitts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbldts.h drtiwps.o: drtiwps.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -12172,17 +11980,6 @@ drtiwps.o: drtiwps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -12191,7 +11988,13 @@ drtiwps.o: drtiwps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12247,11 +12050,14 @@ drtiwps.o: drtiwps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtiws.o: drtiws.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtiws.h \ @@ -12290,17 +12096,6 @@ drtiws.o: drtiws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -12309,7 +12104,13 @@ drtiws.o: drtiws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12365,11 +12166,14 @@ drtiws.o: drtiws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtlsds.o: drtlsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtlsds.h \ @@ -12408,17 +12212,6 @@ drtlsds.o: drtlsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -12427,7 +12220,13 @@ drtlsds.o: drtlsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12483,11 +12282,14 @@ drtlsds.o: drtlsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtlsds6.o: drtlsds6.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtlsds6.h \ @@ -12526,17 +12328,6 @@ drtlsds6.o: drtlsds6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -12545,7 +12336,13 @@ drtlsds6.o: drtlsds6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12601,11 +12398,14 @@ drtlsds6.o: drtlsds6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtlsds7.o: drtlsds7.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtlsds7.h \ @@ -12644,17 +12444,6 @@ drtlsds7.o: drtlsds7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -12663,7 +12452,13 @@ drtlsds7.o: drtlsds7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12719,11 +12514,14 @@ drtlsds7.o: drtlsds7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtmacds.o: drtmacds.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtmacds.h \ @@ -12762,17 +12560,6 @@ drtmacds.o: drtmacds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -12781,7 +12568,13 @@ drtmacds.o: drtmacds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12837,11 +12630,14 @@ drtmacds.o: drtmacds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtcss.h ../include/dcmtk/dcmrt/seq/drtecs.h drtmas.o: drtmas.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -12881,17 +12677,6 @@ drtmas.o: drtmas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -12900,7 +12685,13 @@ drtmas.o: drtmas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -12956,11 +12747,14 @@ drtmas.o: drtmas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtmdrs.o: drtmdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtmdrs.h \ @@ -12999,17 +12793,6 @@ drtmdrs.o: drtmdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13018,7 +12801,13 @@ drtmdrs.o: drtmdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -13074,11 +12863,14 @@ drtmdrs.o: drtmdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtmls.o: drtmls.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtmls.h \ @@ -13117,17 +12909,6 @@ drtmls.o: drtmls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13136,7 +12917,13 @@ drtmls.o: drtmls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -13192,11 +12979,14 @@ drtmls.o: drtmls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtmps.o: drtmps.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtmps.h \ @@ -13235,17 +13025,6 @@ drtmps.o: drtmps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13254,7 +13033,13 @@ drtmps.o: drtmps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -13310,11 +13095,14 @@ drtmps.o: drtmps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtmris.o: drtmris.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtmris.h \ @@ -13353,17 +13141,6 @@ drtmris.o: drtmris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13372,7 +13149,13 @@ drtmris.o: drtmris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -13428,11 +13211,14 @@ drtmris.o: drtmris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtmss.o: drtmss.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtmss.h \ @@ -13471,17 +13257,6 @@ drtmss.o: drtmss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13490,7 +13265,13 @@ drtmss.o: drtmss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -13546,11 +13327,14 @@ drtmss.o: drtmss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtmucs.o: drtmucs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtmucs.h \ @@ -13589,17 +13373,6 @@ drtmucs.o: drtmucs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13608,7 +13381,13 @@ drtmucs.o: drtmucs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -13664,11 +13443,14 @@ drtmucs.o: drtmucs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtoas.o: drtoas.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -13708,17 +13490,6 @@ drtoas.o: drtoas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13727,7 +13498,13 @@ drtoas.o: drtoas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -13783,11 +13560,14 @@ drtoas.o: drtoas.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtmas.h drtois.o: drtois.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -13827,17 +13607,6 @@ drtois.o: drtois.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13846,7 +13615,13 @@ drtois.o: drtois.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -13902,11 +13677,14 @@ drtois.o: drtois.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtics.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtpics.h @@ -13947,17 +13725,6 @@ drtopis.o: drtopis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -13966,7 +13733,13 @@ drtopis.o: drtopis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14022,11 +13795,14 @@ drtopis.o: drtopis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtipiqs.h \ ../include/dcmtk/dcmrt/seq/drtaadcs.h \ @@ -14069,17 +13845,6 @@ drtos.o: drtos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -14088,7 +13853,13 @@ drtos.o: drtos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14144,11 +13915,14 @@ drtos.o: drtos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtois.h ../include/dcmtk/dcmrt/seq/drtics.h \ ../include/dcmtk/dcmrt/seq/drtecs.h ../include/dcmtk/dcmrt/seq/drtpics.h @@ -14189,17 +13963,6 @@ drtpbcs.o: drtpbcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -14208,7 +13971,13 @@ drtpbcs.o: drtpbcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14264,11 +14033,14 @@ drtpbcs.o: drtpbcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtpcs.o: drtpcs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -14308,17 +14080,6 @@ drtpcs.o: drtpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -14327,7 +14088,13 @@ drtpcs.o: drtpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14383,11 +14150,14 @@ drtpcs.o: drtpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtpcxs.o: drtpcxs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -14427,17 +14197,6 @@ drtpcxs.o: drtpcxs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -14446,7 +14205,13 @@ drtpcxs.o: drtpcxs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14502,11 +14267,14 @@ drtpcxs.o: drtpcxs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtccs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtcncs.h \ @@ -14550,17 +14318,6 @@ drtpdecs.o: drtpdecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -14569,7 +14326,13 @@ drtpdecs.o: drtpdecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14625,11 +14388,14 @@ drtpdecs.o: drtpdecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtdias.h \ ../include/dcmtk/dcmrt/seq/drtpdeds.h @@ -14670,17 +14436,6 @@ drtpdeds.o: drtpdeds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -14689,7 +14444,13 @@ drtpdeds.o: drtpdeds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14745,11 +14506,14 @@ drtpdeds.o: drtpdeds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtpfms.o: drtpfms.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtpfms.h \ @@ -14788,17 +14552,6 @@ drtpfms.o: drtpfms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -14807,7 +14560,13 @@ drtpfms.o: drtpfms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14863,11 +14622,14 @@ drtpfms.o: drtpfms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtpics.o: drtpics.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtpics.h \ @@ -14906,17 +14668,6 @@ drtpics.o: drtpics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -14925,7 +14676,13 @@ drtpics.o: drtpics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -14981,11 +14738,14 @@ drtpics.o: drtpics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtplan.o: drtplan.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -15023,18 +14783,6 @@ drtplan.o: drtplan.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -15043,7 +14791,14 @@ drtplan.o: drtplan.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -15099,11 +14854,14 @@ drtplan.o: drtplan.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtass.h ../include/dcmtk/dcmrt/seq/drtbads.h \ @@ -15235,17 +14993,6 @@ drtporcs.o: drtporcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -15254,7 +15001,13 @@ drtporcs.o: drtporcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -15310,11 +15063,14 @@ drtporcs.o: drtporcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtporis.o: drtporis.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -15354,17 +15110,6 @@ drtporis.o: drtporis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -15373,7 +15118,13 @@ drtporis.o: drtporis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -15429,11 +15180,14 @@ drtporis.o: drtporis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtics.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtpics.h @@ -15474,17 +15228,6 @@ drtppcs.o: drtppcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -15493,7 +15236,13 @@ drtppcs.o: drtppcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -15549,11 +15298,14 @@ drtppcs.o: drtppcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h ../include/dcmtk/dcmrt/seq/drtpcxs.h \ ../include/dcmtk/dcmrt/seq/drtccs.h ../include/dcmtk/dcmrt/seq/drtcncs.h \ @@ -15597,17 +15349,6 @@ drtprsis.o: drtprsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -15616,7 +15357,13 @@ drtprsis.o: drtprsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -15672,11 +15419,14 @@ drtprsis.o: drtprsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtics.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtpics.h @@ -15717,17 +15467,6 @@ drtpscs.o: drtpscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -15736,7 +15475,13 @@ drtpscs.o: drtpscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -15792,11 +15537,14 @@ drtpscs.o: drtpscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtpsics.o: drtpsics.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -15836,17 +15584,6 @@ drtpsics.o: drtpsics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -15855,7 +15592,13 @@ drtpsics.o: drtpsics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -15911,11 +15654,14 @@ drtpsics.o: drtpsics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtpss.o: drtpss.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -15955,17 +15701,6 @@ drtpss.o: drtpss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -15974,7 +15709,13 @@ drtpss.o: drtpss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16030,11 +15771,14 @@ drtpss.o: drtpss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtfds.h ../include/dcmtk/dcmrt/seq/drtmss.h \ ../include/dcmtk/dcmrt/seq/drtrsis.h ../include/dcmtk/dcmrt/seq/drtsds.h \ @@ -16076,17 +15820,6 @@ drtpsss.o: drtpsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -16095,7 +15828,13 @@ drtpsss.o: drtpsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16151,11 +15890,14 @@ drtpsss.o: drtpsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtpvis.o: drtpvis.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtpvis.h \ @@ -16194,17 +15936,6 @@ drtpvis.o: drtpvis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -16213,7 +15944,13 @@ drtpvis.o: drtpvis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16269,11 +16006,14 @@ drtpvis.o: drtpvis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtqds.o: drtqds.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtqds.h \ @@ -16312,17 +16052,6 @@ drtqds.o: drtqds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -16331,7 +16060,13 @@ drtqds.o: drtqds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16387,11 +16122,14 @@ drtqds.o: drtqds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtccs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtcncs.h \ @@ -16434,17 +16172,6 @@ drtras.o: drtras.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -16453,7 +16180,13 @@ drtras.o: drtras.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16509,11 +16242,14 @@ drtras.o: drtras.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtians.h \ ../include/dcmtk/dcmrt/seq/drtrrpcs.h \ @@ -16562,17 +16298,6 @@ drtrbas2.o: drtrbas2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -16581,7 +16306,13 @@ drtrbas2.o: drtrbas2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16637,11 +16368,14 @@ drtrbas2.o: drtrbas2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrbas8.o: drtrbas8.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrbas8.h \ @@ -16680,17 +16414,6 @@ drtrbas8.o: drtrbas8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -16699,7 +16422,13 @@ drtrbas8.o: drtrbas8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16755,11 +16484,14 @@ drtrbas8.o: drtrbas8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrbls.o: drtrbls.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrbls.h \ @@ -16798,17 +16530,6 @@ drtrbls.o: drtrbls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -16817,7 +16538,13 @@ drtrbls.o: drtrbls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16873,11 +16600,14 @@ drtrbls.o: drtrbls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrbos1.o: drtrbos1.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrbos1.h \ @@ -16916,17 +16646,6 @@ drtrbos1.o: drtrbos1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -16935,7 +16654,13 @@ drtrbos1.o: drtrbos1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -16991,11 +16716,14 @@ drtrbos1.o: drtrbos1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrbos6.o: drtrbos6.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrbos6.h \ @@ -17034,17 +16762,6 @@ drtrbos6.o: drtrbos6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17053,7 +16770,13 @@ drtrbos6.o: drtrbos6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -17109,11 +16832,14 @@ drtrbos6.o: drtrbos6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrbos7.o: drtrbos7.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrbos7.h \ @@ -17152,17 +16878,6 @@ drtrbos7.o: drtrbos7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17171,7 +16886,13 @@ drtrbos7.o: drtrbos7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -17227,11 +16948,14 @@ drtrbos7.o: drtrbos7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrbs2.o: drtrbs2.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrbs2.h \ @@ -17270,17 +16994,6 @@ drtrbs2.o: drtrbs2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17289,7 +17002,13 @@ drtrbs2.o: drtrbs2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -17345,11 +17064,14 @@ drtrbs2.o: drtrbs2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrcps.h drtrbs4.o: drtrbs4.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -17389,17 +17111,6 @@ drtrbs4.o: drtrbs4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17408,7 +17119,13 @@ drtrbs4.o: drtrbs4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -17464,11 +17181,14 @@ drtrbs4.o: drtrbs4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrbs8.o: drtrbs8.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrbs8.h \ @@ -17507,17 +17227,6 @@ drtrbs8.o: drtrbs8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17526,7 +17235,13 @@ drtrbs8.o: drtrbs8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -17582,11 +17297,14 @@ drtrbs8.o: drtrbs8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrcdrs.o: drtrcdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrcdrs.h \ @@ -17625,17 +17343,6 @@ drtrcdrs.o: drtrcdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17644,7 +17351,13 @@ drtrcdrs.o: drtrcdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -17700,11 +17413,14 @@ drtrcdrs.o: drtrcdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrcos.o: drtrcos.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrcos.h \ @@ -17743,17 +17459,6 @@ drtrcos.o: drtrcos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17762,7 +17467,13 @@ drtrcos.o: drtrcos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -17818,11 +17529,14 @@ drtrcos.o: drtrcos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrcps.o: drtrcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrcps.h \ @@ -17861,17 +17575,6 @@ drtrcps.o: drtrcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17880,7 +17583,13 @@ drtrcps.o: drtrcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -17936,11 +17645,14 @@ drtrcps.o: drtrcps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrcs.o: drtrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrcs.h \ @@ -17979,17 +17691,6 @@ drtrcs.o: drtrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -17998,7 +17699,13 @@ drtrcs.o: drtrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -18054,11 +17761,14 @@ drtrcs.o: drtrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtcs.h ../include/dcmtk/dcmrt/seq/drtcis.h drtrdros.o: drtrdros.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -18098,17 +17808,6 @@ drtrdros.o: drtrdros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -18117,7 +17816,13 @@ drtrdros.o: drtrdros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -18173,11 +17878,14 @@ drtrdros.o: drtrdros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrdrs1.o: drtrdrs1.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrdrs1.h \ @@ -18216,17 +17924,6 @@ drtrdrs1.o: drtrdrs1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -18235,8 +17932,14 @@ drtrdrs1.o: drtrdrs1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -18291,11 +17994,14 @@ drtrdrs1.o: drtrdrs1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbvcps.h drtrdrs6.o: drtrdrs6.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -18335,17 +18041,6 @@ drtrdrs6.o: drtrdrs6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -18354,7 +18049,13 @@ drtrdrs6.o: drtrdrs6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -18410,11 +18111,14 @@ drtrdrs6.o: drtrdrs6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrdrs8.o: drtrdrs8.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrdrs8.h \ @@ -18453,17 +18157,6 @@ drtrdrs8.o: drtrdrs8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -18472,7 +18165,13 @@ drtrdrs8.o: drtrdrs8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -18528,11 +18227,14 @@ drtrdrs8.o: drtrdrs8.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrds.o: drtrds.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrds.h \ @@ -18571,17 +18273,6 @@ drtrds.o: drtrds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -18590,7 +18281,13 @@ drtrds.o: drtrds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -18646,11 +18343,14 @@ drtrds.o: drtrds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrecs.o: drtrecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrecs.h \ @@ -18689,17 +18389,6 @@ drtrecs.o: drtrecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -18708,7 +18397,13 @@ drtrecs.o: drtrecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -18764,11 +18459,14 @@ drtrecs.o: drtrecs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrfgs.o: drtrfgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrfgs.h \ @@ -18807,17 +18505,6 @@ drtrfgs.o: drtrfgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -18826,7 +18513,13 @@ drtrfgs.o: drtrfgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -18882,11 +18575,14 @@ drtrfgs.o: drtrfgs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrbs2.h \ ../include/dcmtk/dcmrt/seq/drtrcps.h \ @@ -18928,17 +18624,6 @@ drtrfors.o: drtrfors.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -18947,7 +18632,13 @@ drtrfors.o: drtrfors.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19003,11 +18694,14 @@ drtrfors.o: drtrfors.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrsts.h \ ../include/dcmtk/dcmrt/seq/drtrses.h ../include/dcmtk/dcmrt/seq/drtcis.h @@ -19048,17 +18742,6 @@ drtrics.o: drtrics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -19067,7 +18750,13 @@ drtrics.o: drtrics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19123,11 +18812,14 @@ drtrics.o: drtrics.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtsptcs.h @@ -19168,17 +18860,6 @@ drtrims.o: drtrims.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -19187,7 +18868,13 @@ drtrims.o: drtrims.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19243,11 +18930,14 @@ drtrims.o: drtrims.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtporcs.h \ ../include/dcmtk/dcmrt/seq/drtecs.h @@ -19288,17 +18978,6 @@ drtris.o: drtris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -19307,7 +18986,13 @@ drtris.o: drtris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19363,11 +19048,14 @@ drtris.o: drtris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtporcs.h \ ../include/dcmtk/dcmrt/seq/drtecs.h @@ -19408,17 +19096,6 @@ drtrlsds.o: drtrlsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -19427,7 +19104,13 @@ drtrlsds.o: drtrlsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19483,11 +19166,14 @@ drtrlsds.o: drtrlsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrmdrs.o: drtrmdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrmdrs.h \ @@ -19526,17 +19212,6 @@ drtrmdrs.o: drtrmdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -19545,7 +19220,13 @@ drtrmdrs.o: drtrmdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19601,11 +19282,14 @@ drtrmdrs.o: drtrmdrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrms.o: drtrms.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrms.h \ @@ -19644,17 +19328,6 @@ drtrms.o: drtrms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -19663,7 +19336,13 @@ drtrms.o: drtrms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19719,11 +19398,14 @@ drtrms.o: drtrms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrmss6.o: drtrmss6.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrmss6.h \ @@ -19762,17 +19444,6 @@ drtrmss6.o: drtrmss6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -19781,7 +19452,13 @@ drtrmss6.o: drtrmss6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19837,11 +19514,14 @@ drtrmss6.o: drtrmss6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrmss7.o: drtrmss7.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrmss7.h \ @@ -19880,17 +19560,6 @@ drtrmss7.o: drtrmss7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -19899,7 +19568,13 @@ drtrmss7.o: drtrmss7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -19955,11 +19630,14 @@ drtrmss7.o: drtrmss7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrpcs.o: drtrpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrpcs.h \ @@ -19998,17 +19676,6 @@ drtrpcs.o: drtrpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20017,7 +19684,13 @@ drtrpcs.o: drtrpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -20073,11 +19746,14 @@ drtrpcs.o: drtrpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtrpis.o: drtrpis.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -20117,17 +19793,6 @@ drtrpis.o: drtrpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20136,7 +19801,13 @@ drtrpis.o: drtrpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -20192,11 +19863,14 @@ drtrpis.o: drtrpis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtics.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtpics.h @@ -20237,17 +19911,6 @@ drtrppcs.o: drtrppcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20256,7 +19919,13 @@ drtrppcs.o: drtrppcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -20312,11 +19981,14 @@ drtrppcs.o: drtrppcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtrpphs.o: drtrpphs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -20356,17 +20028,6 @@ drtrpphs.o: drtrpphs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20375,7 +20036,13 @@ drtrpphs.o: drtrpphs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -20431,11 +20098,14 @@ drtrpphs.o: drtrpphs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtdimrs.h \ ../include/dcmtk/dcmrt/seq/drtdirs.h \ @@ -20479,17 +20149,6 @@ drtrpps.o: drtrpps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20498,7 +20157,13 @@ drtrpps.o: drtrpps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -20554,11 +20219,14 @@ drtrpps.o: drtrpps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrecs.h drtrppss.o: drtrppss.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -20598,17 +20266,6 @@ drtrppss.o: drtrppss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20617,7 +20274,13 @@ drtrppss.o: drtrppss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -20673,11 +20336,14 @@ drtrppss.o: drtrppss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrps.o: drtrps.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrps.h \ @@ -20716,17 +20382,6 @@ drtrps.o: drtrps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20735,10 +20390,16 @@ drtrps.o: drtrps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \ @@ -20791,11 +20452,14 @@ drtrps.o: drtrps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrris1.o: drtrris1.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrris1.h \ @@ -20834,17 +20498,6 @@ drtrris1.o: drtrris1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20853,7 +20506,13 @@ drtrris1.o: drtrris1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -20909,11 +20568,14 @@ drtrris1.o: drtrris1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrris6.o: drtrris6.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrris6.h \ @@ -20952,17 +20614,6 @@ drtrris6.o: drtrris6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -20971,7 +20622,13 @@ drtrris6.o: drtrris6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21027,11 +20684,14 @@ drtrris6.o: drtrris6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrris9.o: drtrris9.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrris9.h \ @@ -21070,17 +20730,6 @@ drtrris9.o: drtrris9.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -21089,7 +20738,13 @@ drtrris9.o: drtrris9.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21145,11 +20800,14 @@ drtrris9.o: drtrris9.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrrms.o: drtrrms.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrrms.h \ @@ -21188,17 +20846,6 @@ drtrrms.o: drtrrms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -21207,7 +20854,13 @@ drtrrms.o: drtrrms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21263,11 +20916,14 @@ drtrrms.o: drtrrms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrros.o: drtrros.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrros.h \ @@ -21306,17 +20962,6 @@ drtrros.o: drtrros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -21325,7 +20970,13 @@ drtrros.o: drtrros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21381,11 +21032,14 @@ drtrros.o: drtrros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrpps.h \ ../include/dcmtk/dcmrt/seq/drtrecs.h \ @@ -21431,17 +21085,6 @@ drtrrpcs.o: drtrrpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -21450,7 +21093,13 @@ drtrrpcs.o: drtrrpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21506,11 +21155,14 @@ drtrrpcs.o: drtrrpcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtrrros.o: drtrrros.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -21550,17 +21202,6 @@ drtrrros.o: drtrrros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -21569,7 +21210,13 @@ drtrrros.o: drtrrros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21625,11 +21272,14 @@ drtrrros.o: drtrrros.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrrs.o: drtrrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrrs.h \ @@ -21668,17 +21318,6 @@ drtrrs.o: drtrrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -21687,7 +21326,13 @@ drtrrs.o: drtrrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21743,11 +21388,14 @@ drtrrs.o: drtrrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrrshs.o: drtrrshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrrshs.h \ @@ -21786,17 +21434,6 @@ drtrrshs.o: drtrrshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -21805,7 +21442,13 @@ drtrrshs.o: drtrrshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21861,11 +21504,14 @@ drtrrshs.o: drtrrshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrrtps.o: drtrrtps.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrrtps.h \ @@ -21904,17 +21550,6 @@ drtrrtps.o: drtrrtps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -21923,7 +21558,13 @@ drtrrtps.o: drtrrtps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -21979,11 +21620,14 @@ drtrrtps.o: drtrrtps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrfgs.h \ ../include/dcmtk/dcmrt/seq/drtrbs2.h \ @@ -22026,17 +21670,6 @@ drtrrtps3.o: drtrrtps3.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22045,7 +21678,13 @@ drtrrtps3.o: drtrrtps3.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -22101,11 +21740,14 @@ drtrrtps3.o: drtrrtps3.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrrtps4.o: drtrrtps4.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrrtps4.h \ @@ -22144,17 +21786,6 @@ drtrrtps4.o: drtrrtps4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22163,7 +21794,13 @@ drtrrtps4.o: drtrrtps4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -22219,11 +21856,14 @@ drtrrtps4.o: drtrrtps4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrrtps5.o: drtrrtps5.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrrtps5.h \ @@ -22262,17 +21902,6 @@ drtrrtps5.o: drtrrtps5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22281,7 +21910,13 @@ drtrrtps5.o: drtrrtps5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -22337,11 +21972,14 @@ drtrrtps5.o: drtrrtps5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrscs.o: drtrscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrscs.h \ @@ -22380,17 +22018,6 @@ drtrscs.o: drtrscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22399,7 +22026,13 @@ drtrscs.o: drtrscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -22455,11 +22088,14 @@ drtrscs.o: drtrscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtrsers.o: drtrsers.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -22499,17 +22135,6 @@ drtrsers.o: drtrsers.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22518,7 +22143,13 @@ drtrsers.o: drtrsers.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -22574,11 +22205,14 @@ drtrsers.o: drtrsers.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtris.h \ ../include/dcmtk/dcmrt/seq/drtporcs.h \ @@ -22620,17 +22254,6 @@ drtrses.o: drtrses.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22639,7 +22262,13 @@ drtrses.o: drtrses.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -22695,11 +22324,14 @@ drtrses.o: drtrses.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtcis.h drtrshs.o: drtrshs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -22739,17 +22371,6 @@ drtrshs.o: drtrshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22758,7 +22379,13 @@ drtrshs.o: drtrshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -22814,11 +22441,14 @@ drtrshs.o: drtrshs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrshs6.o: drtrshs6.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrshs6.h \ @@ -22857,17 +22487,6 @@ drtrshs6.o: drtrshs6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22876,7 +22495,13 @@ drtrshs6.o: drtrshs6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -22932,11 +22557,14 @@ drtrshs6.o: drtrshs6.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrshs7.o: drtrshs7.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrshs7.h \ @@ -22975,17 +22603,6 @@ drtrshs7.o: drtrshs7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -22994,7 +22611,13 @@ drtrshs7.o: drtrshs7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23050,11 +22673,14 @@ drtrshs7.o: drtrshs7.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrsis.o: drtrsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrsis.h \ @@ -23093,17 +22719,6 @@ drtrsis.o: drtrsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -23112,7 +22727,13 @@ drtrsis.o: drtrsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23168,11 +22789,14 @@ drtrsis.o: drtrsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrsns.o: drtrsns.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrsns.h \ @@ -23211,17 +22835,6 @@ drtrsns.o: drtrsns.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -23230,7 +22843,13 @@ drtrsns.o: drtrsns.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23286,11 +22905,14 @@ drtrsns.o: drtrsns.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrsos.o: drtrsos.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrsos.h \ @@ -23329,17 +22951,6 @@ drtrsos.o: drtrsos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -23348,7 +22959,13 @@ drtrsos.o: drtrsos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23404,11 +23021,14 @@ drtrsos.o: drtrsos.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrsrs.o: drtrsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrsrs.h \ @@ -23447,17 +23067,6 @@ drtrsrs.o: drtrsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -23466,7 +23075,13 @@ drtrsrs.o: drtrsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23522,11 +23137,14 @@ drtrsrs.o: drtrsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrss.o: drtrss.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrss.h \ @@ -23565,17 +23183,6 @@ drtrss.o: drtrss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -23584,7 +23191,13 @@ drtrss.o: drtrss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23640,11 +23253,14 @@ drtrss.o: drtrss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrsss.o: drtrsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrsss.h \ @@ -23683,17 +23299,6 @@ drtrsss.o: drtrsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -23702,7 +23307,13 @@ drtrsss.o: drtrsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23758,11 +23369,14 @@ drtrsss.o: drtrsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrsts.o: drtrsts.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrsts.h \ @@ -23801,17 +23415,6 @@ drtrsts.o: drtrsts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -23820,7 +23423,13 @@ drtrsts.o: drtrsts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23876,11 +23485,14 @@ drtrsts.o: drtrsts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrses.h ../include/dcmtk/dcmrt/seq/drtcis.h drtrtrs2.o: drtrtrs2.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -23920,17 +23532,6 @@ drtrtrs2.o: drtrtrs2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -23939,7 +23540,13 @@ drtrtrs2.o: drtrtrs2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -23995,11 +23602,14 @@ drtrtrs2.o: drtrtrs2.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrbs2.h \ ../include/dcmtk/dcmrt/seq/drtrcps.h @@ -24040,17 +23650,6 @@ drtrtrs4.o: drtrtrs4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -24059,7 +23658,13 @@ drtrtrs4.o: drtrtrs4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -24115,11 +23720,14 @@ drtrtrs4.o: drtrtrs4.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrvis.o: drtrvis.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrvis.h \ @@ -24158,17 +23766,6 @@ drtrvis.o: drtrvis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -24177,7 +23774,13 @@ drtrvis.o: drtrvis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -24233,11 +23836,14 @@ drtrvis.o: drtrvis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrws.o: drtrws.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrws.h \ @@ -24276,17 +23882,6 @@ drtrws.o: drtrws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -24295,7 +23890,13 @@ drtrws.o: drtrws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -24351,11 +23952,14 @@ drtrws.o: drtrws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtrwvms.o: drtrwvms.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtrwvms.h \ @@ -24394,17 +23998,6 @@ drtrwvms.o: drtrwvms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -24413,7 +24006,13 @@ drtrwvms.o: drtrwvms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -24469,11 +24068,14 @@ drtrwvms.o: drtrwvms.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtmucs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtqds.h ../include/dcmtk/dcmrt/seq/drtccs.h \ @@ -24516,17 +24118,6 @@ drtscris.o: drtscris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -24535,7 +24126,13 @@ drtscris.o: drtscris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -24591,11 +24188,14 @@ drtscris.o: drtscris.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtrsers.h \ ../include/dcmtk/dcmrt/seq/drtris.h \ @@ -24638,17 +24238,6 @@ drtscs.o: drtscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -24657,7 +24246,13 @@ drtscs.o: drtscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -24713,11 +24308,14 @@ drtscs.o: drtscs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtsdcs.o: drtsdcs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -24757,17 +24355,6 @@ drtsdcs.o: drtsdcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -24776,7 +24363,13 @@ drtsdcs.o: drtsdcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -24832,11 +24425,14 @@ drtsdcs.o: drtsdcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtsds.o: drtsds.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -24876,17 +24472,6 @@ drtsds.o: drtsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -24895,7 +24480,13 @@ drtsds.o: drtsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -24951,11 +24542,14 @@ drtsds.o: drtsds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtshds.o: drtshds.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtshds.h \ @@ -24994,17 +24588,6 @@ drtshds.o: drtshds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25013,7 +24596,13 @@ drtshds.o: drtshds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -25069,11 +24658,14 @@ drtshds.o: drtshds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtsins.o: drtsins.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtsins.h \ @@ -25112,17 +24704,6 @@ drtsins.o: drtsins.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25131,7 +24712,13 @@ drtsins.o: drtsins.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -25187,11 +24774,14 @@ drtsins.o: drtsins.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtporcs.h \ ../include/dcmtk/dcmrt/seq/drtecs.h @@ -25232,17 +24822,6 @@ drtsis.o: drtsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25251,7 +24830,13 @@ drtsis.o: drtsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -25307,11 +24892,14 @@ drtsis.o: drtsis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtporcs.h \ ../include/dcmtk/dcmrt/seq/drtecs.h @@ -25352,17 +24940,6 @@ drtsns.o: drtsns.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25371,7 +24948,13 @@ drtsns.o: drtsns.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -25427,11 +25010,14 @@ drtsns.o: drtsns.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtspccs.o: drtspccs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtspccs.h \ @@ -25470,17 +25056,6 @@ drtspccs.o: drtspccs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25489,7 +25064,13 @@ drtspccs.o: drtspccs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -25545,11 +25126,14 @@ drtspccs.o: drtspccs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtspcs.o: drtspcs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -25589,17 +25173,6 @@ drtspcs.o: drtspcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25608,7 +25181,13 @@ drtspcs.o: drtspcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -25664,11 +25243,14 @@ drtspcs.o: drtspcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h ../include/dcmtk/dcmrt/seq/drtpcxs.h \ ../include/dcmtk/dcmrt/seq/drtccs.h ../include/dcmtk/dcmrt/seq/drtcncs.h \ @@ -25712,17 +25294,6 @@ drtspgis.o: drtspgis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25731,7 +25302,13 @@ drtspgis.o: drtspgis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -25787,11 +25364,14 @@ drtspgis.o: drtspgis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtipiqs.h \ ../include/dcmtk/dcmrt/seq/drtaadcs.h \ @@ -25830,21 +25410,10 @@ drtsptcs.o: drtsptcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ ../../oflog/include/dcmtk/oflog/spi/filter.h \ ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ - ../../oflog/include/dcmtk/oflog/spi/logfact.h \ - ../../oflog/include/dcmtk/oflog/logmacro.h \ - ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ - ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25853,7 +25422,13 @@ drtsptcs.o: drtsptcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -25909,11 +25484,14 @@ drtsptcs.o: drtsptcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtss.o: drtss.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -25953,17 +25531,6 @@ drtss.o: drtss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -25972,7 +25539,13 @@ drtss.o: drtss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -26028,11 +25601,14 @@ drtss.o: drtss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtssrcs.o: drtssrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtssrcs.h \ @@ -26071,17 +25647,6 @@ drtssrcs.o: drtssrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -26090,7 +25655,13 @@ drtssrcs.o: drtssrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -26146,11 +25717,14 @@ drtssrcs.o: drtssrcs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtecs.h drtssrs.o: drtssrs.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -26190,17 +25764,6 @@ drtssrs.o: drtssrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -26209,7 +25772,13 @@ drtssrs.o: drtssrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -26265,11 +25834,14 @@ drtssrs.o: drtssrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtdcs.h ../include/dcmtk/dcmrt/seq/drtecs.h drtsss.o: drtsss.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -26309,17 +25881,6 @@ drtsss.o: drtsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -26328,7 +25889,13 @@ drtsss.o: drtsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -26384,11 +25951,14 @@ drtsss.o: drtsss.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtssrcs.h \ ../include/dcmtk/dcmrt/seq/drtecs.h @@ -26427,18 +25997,6 @@ drtstrct.o: drtstrct.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -26447,7 +26005,14 @@ drtstrct.o: drtstrct.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -26503,11 +26068,14 @@ drtstrct.o: drtstrct.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -26626,17 +26194,6 @@ drttms0.o: drttms0.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -26645,7 +26202,13 @@ drttms0.o: drttms0.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -26701,11 +26264,14 @@ drttms0.o: drttms0.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drttms9.o: drttms9.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drttms9.h \ @@ -26744,17 +26310,6 @@ drttms9.o: drttms9.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -26763,7 +26318,13 @@ drttms9.o: drttms9.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -26819,11 +26380,14 @@ drttms9.o: drttms9.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drttreat.o: drttreat.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/drttreat.h ../include/dcmtk/dcmrt/drttypes.h \ @@ -26860,18 +26424,6 @@ drttreat.o: drttreat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -26880,7 +26432,14 @@ drttreat.o: drttreat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -26936,11 +26495,14 @@ drttreat.o: drttreat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -27050,17 +26612,6 @@ drttscds.o: drttscds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -27069,7 +26620,13 @@ drttscds.o: drttscds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -27125,11 +26682,14 @@ drttscds.o: drttscds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drttsibs.o: drttsibs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drttsibs.h \ @@ -27168,17 +26728,6 @@ drttsibs.o: drttsibs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -27187,7 +26736,13 @@ drttsibs.o: drttsibs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -27243,11 +26798,14 @@ drttsibs.o: drttsibs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtas7.h \ ../include/dcmtk/dcmrt/seq/drtbldls.h \ @@ -27309,17 +26867,6 @@ drttsmds.o: drttsmds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -27328,7 +26875,13 @@ drttsmds.o: drttsmds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -27384,11 +26937,14 @@ drttsmds.o: drttsmds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drttts.o: drttts.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drttts.h \ @@ -27427,17 +26983,6 @@ drttts.o: drttts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -27446,7 +26991,13 @@ drttts.o: drttts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -27502,11 +27053,14 @@ drttts.o: drttts.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtbldts.h drttypes.o: drttypes.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -27544,18 +27098,6 @@ drttypes.o: drttypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -27564,7 +27106,14 @@ drttypes.o: drttypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -27620,11 +27169,14 @@ drttypes.o: drttypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtudis.o: drtudis.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtudis.h \ @@ -27663,17 +27215,6 @@ drtudis.o: drtudis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -27682,7 +27223,13 @@ drtudis.o: drtudis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -27738,11 +27285,14 @@ drtudis.o: drtudis.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtvls.o: drtvls.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtvls.h \ @@ -27781,17 +27331,6 @@ drtvls.o: drtvls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -27800,7 +27339,13 @@ drtvls.o: drtvls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -27856,11 +27401,14 @@ drtvls.o: drtvls.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtwps.o: drtwps.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtwps.h \ @@ -27899,17 +27447,6 @@ drtwps.o: drtwps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -27918,7 +27455,13 @@ drtwps.o: drtwps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -27974,11 +27517,14 @@ drtwps.o: drtwps.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtwrs.o: drtwrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtwrs.h \ @@ -28017,17 +27563,6 @@ drtwrs.o: drtwrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -28036,7 +27571,13 @@ drtwrs.o: drtwrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -28092,11 +27633,14 @@ drtwrs.o: drtwrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtwrsrs.o: drtwrsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtwrsrs.h \ @@ -28135,17 +27679,6 @@ drtwrsrs.o: drtwrsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -28154,7 +27687,13 @@ drtwrsrs.o: drtwrsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -28210,11 +27749,14 @@ drtwrsrs.o: drtwrsrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtws.o: drtws.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtws.h \ @@ -28253,17 +27795,6 @@ drtws.o: drtws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -28272,7 +27803,13 @@ drtws.o: drtws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -28328,11 +27865,14 @@ drtws.o: drtws.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h drtxrs.o: drtxrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmrt/seq/drtxrs.h \ @@ -28371,17 +27911,6 @@ drtxrs.o: drtxrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -28390,7 +27919,13 @@ drtxrs.o: drtxrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -28446,9 +27981,12 @@ drtxrs.o: drtxrs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h diff --git a/dcmrt/tests/Makefile.dep b/dcmrt/tests/Makefile.dep index 375723b1..6c471d3c 100644 --- a/dcmrt/tests/Makefile.dep +++ b/dcmrt/tests/Makefile.dep @@ -33,18 +33,6 @@ drttest.o: drttest.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -53,7 +41,14 @@ drttest.o: drttest.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -109,11 +104,14 @@ drttest.o: drttest.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtbrs.h \ @@ -412,11 +410,14 @@ tsearch.o: tsearch.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmrt/seq/drtadcs.h ../include/dcmtk/dcmrt/seq/drtecs.h \ ../include/dcmtk/dcmrt/seq/drtass.h ../include/dcmtk/dcmrt/seq/drtbads.h \ diff --git a/dcmseg/include/dcmtk/dcmseg/segdoc.h b/dcmseg/include/dcmtk/dcmseg/segdoc.h index f71cbc87..edd82e8e 100644 --- a/dcmseg/include/dcmtk/dcmseg/segdoc.h +++ b/dcmseg/include/dcmtk/dcmseg/segdoc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, Open Connections GmbH + * Copyright (C) 2015-2019, Open Connections GmbH * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -98,6 +98,26 @@ public: */ OFCondition writeDataset(DcmItem& dataset); + /** If enabled, functional group structure is checked before actual writing + * is performed in the write() method. Checking might be time consuming + * on functional groups with many frames, though disabling might result in + * invalid functional group structures. Disabling should only be done if the + * user knows that the functional groups are valid, wants to to adapt the + * functional groups manually after calling write() or knows what he's doing + * otherwise.
+ * Per default, checking is enabled. + * @param doCheck If OFTrue, checking will be performed. If OFFalse, + * no checks are performed. + */ + virtual void setCheckFGOnWrite(const OFBool doCheck); + + /** Returns whether functional group structure is checked before actual + * writing is performed in the write() method. + * @return OFTrue if checking is performed, OFFalse otherwise + */ + virtual OFBool getCheckFGOnWrite(); + + // -------------------- creation --------------------- /** Factory method to create a binary segmentation object from the minimal @@ -191,9 +211,11 @@ public: /** Perform some basic checking. This method is also invoked when * writing the object to a DICOM dataset or file. + * @param checkFGStructure If OFTrue (default), structure of functional + * groups is checked, too. * @return OFTrue, if no errors were found, OFFalse otherwise. */ - virtual OFBool check(); + virtual OFBool check(const OFBool checkFGStructure = OFTrue); /** Get access to functional groups. This is meant for reading data from * functional groups that are not actively managed, i.e.\ made accessible by diff --git a/dcmseg/libsrc/Makefile.dep b/dcmseg/libsrc/Makefile.dep index 0e3d9e23..c3e4e7b1 100644 --- a/dcmseg/libsrc/Makefile.dep +++ b/dcmseg/libsrc/Makefile.dep @@ -51,17 +51,6 @@ segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmiod/include/dcmtk/dcmiod/ioddef.h \ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \ ../../dcmiod/include/dcmtk/dcmiod/modpatient.h \ @@ -72,7 +61,13 @@ segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \ @@ -125,11 +120,14 @@ segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \ ../../dcmiod/include/dcmtk/dcmiod/modpatientstudy.h \ @@ -208,22 +206,17 @@ segment.o: segment.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -283,11 +276,14 @@ segment.o: segment.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \ ../include/dcmtk/dcmseg/segtypes.h ../include/dcmtk/dcmseg/segdef.h \ @@ -370,22 +366,17 @@ segtypes.o: segtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -444,11 +435,14 @@ segtypes.o: segtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \ ../include/dcmtk/dcmseg/segtypes.h ../include/dcmtk/dcmseg/segdef.h @@ -487,29 +481,24 @@ segutils.o: segutils.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -565,11 +554,14 @@ segutils.o: segutils.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \ diff --git a/dcmseg/libsrc/segdoc.cc b/dcmseg/libsrc/segdoc.cc index b639d353..482c9319 100644 --- a/dcmseg/libsrc/segdoc.cc +++ b/dcmseg/libsrc/segdoc.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, Open Connections GmbH + * Copyright (C) 2015-2019, Open Connections GmbH * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -256,9 +256,23 @@ OFCondition DcmSegmentation::read(DcmItem &dataset) } +void DcmSegmentation::setCheckFGOnWrite(const OFBool doCheck) +{ + m_FGInterface.setCheckOnWrite(doCheck); +} + + +OFBool DcmSegmentation::getCheckFGOnWrite() +{ + return m_FGInterface.getCheckOnWrite(); +} + + OFCondition DcmSegmentation::write(DcmItem &dataset) { - if (!check()) + // FGInterface::write() will know whether it has to check FG structure + // so we do not need to check FG structure here (OFFalse). + if (!check(OFFalse)) { return IOD_EC_InvalidObject; } @@ -380,7 +394,16 @@ OFCondition DcmSegmentation::addFrame(Uint8* pixData) if (frame) { frame->length = rows*cols; - frame->pixData = pixData; + frame->pixData = new Uint8[frame->length]; + if (frame->pixData) + { + memcpy(frame->pixData, pixData, frame->length); + } + else + { + delete frame; + result = EC_MemoryExhausted; + } } else result = EC_MemoryExhausted; @@ -395,7 +418,6 @@ OFCondition DcmSegmentation::addFrame(Uint8* pixData) DCMSEG_ERROR("Cannot add frame since rows and/or columns are unknown"); result = IOD_EC_CannotInsertFrame; } - return result; } @@ -1229,7 +1251,7 @@ IODImagePixelModule& DcmSegmentation::getImagePixel() } -OFBool DcmSegmentation::check() +OFBool DcmSegmentation::check(const OFBool checkFGStructure) { if (m_Frames.size() == 0) { @@ -1247,9 +1269,10 @@ OFBool DcmSegmentation::check() return OFFalse; } - if (!m_FGInterface.check()) + if (checkFGStructure) { - return OFFalse; + if (!m_FGInterface.check()) + return OFFalse; } // Check rules around Frame of Reference @@ -1283,7 +1306,7 @@ OFBool DcmSegmentation::check() // Check that each of above FGs is present. We do not check this for // all frames since if it exists for one frame it must exist for all others. // This is a general rule and applies for all FGs, so it is not checked here. - FGBase* group = m_FGInterface.get(OFstatic_cast(Uint32, 0), DcmFGTypes::EFG_PIXELMEASURES); + group = m_FGInterface.get(OFstatic_cast(Uint32, 0), DcmFGTypes::EFG_PIXELMEASURES); if (!group) { DCMSEG_ERROR("Frame of Reference UID is present but Pixel Measures FG is missing"); @@ -1360,7 +1383,7 @@ OFCondition DcmSegmentation::extractFrames(Uint8* pixData, size_t overlapBits = (8 - (bitsPerFrame % 8)) % 8; // Add an extra byte if we we fill a partial byte in the end if (overlapBits != 0) frameLengthBytes++; - // Points to current reading position within pixeldata + // Points to current reading position within pixData Uint8* readPos = pixData; // Loop over each frame and copy it to Frame structures for (size_t f = 0; f < numFrames; f++) diff --git a/dcmseg/tests/Makefile.dep b/dcmseg/tests/Makefile.dep index 3e90ed13..b9945927 100644 --- a/dcmseg/tests/Makefile.dep +++ b/dcmseg/tests/Makefile.dep @@ -161,11 +161,14 @@ tutils.o: tutils.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \ diff --git a/dcmsign/apps/Makefile.dep b/dcmsign/apps/Makefile.dep index 6a0a0815..a836795b 100644 --- a/dcmsign/apps/Makefile.dep +++ b/dcmsign/apps/Makefile.dep @@ -118,8 +118,11 @@ dcmsign.o: dcmsign.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h + ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h diff --git a/dcmsign/libsrc/Makefile.dep b/dcmsign/libsrc/Makefile.dep index ee5b53ec..5e03274a 100644 --- a/dcmsign/libsrc/Makefile.dep +++ b/dcmsign/libsrc/Makefile.dep @@ -33,26 +33,21 @@ dcsignat.o: dcsignat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -118,24 +113,13 @@ siautopr.o: siautopr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h sibrsapr.o: sibrsapr.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -174,24 +158,13 @@ sibrsapr.o: sibrsapr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h sicert.o: sicert.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -229,26 +202,21 @@ sicert.o: sicert.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h ../include/dcmtk/dcmsign/sirsa.h \ ../include/dcmtk/dcmsign/sialgo.h ../include/dcmtk/dcmsign/sidsa.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ @@ -296,18 +264,6 @@ sicertvf.o: sicertvf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h ../include/dcmtk/dcmsign/sicertvf.h sicreapr.o: sicreapr.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsign/sicreapr.h ../include/dcmtk/dcmsign/sibrsapr.h \ @@ -345,24 +301,13 @@ sicreapr.o: sicreapr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h sidsa.o: sidsa.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -401,18 +346,6 @@ sidsa.o: sidsa.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h ../include/dcmtk/dcmsign/sicert.h \ ../include/dcmtk/dcmsign/siprivat.h simaccon.o: simaccon.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -450,18 +383,6 @@ simaccon.o: simaccon.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrmb.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ @@ -470,6 +391,13 @@ simaccon.o: simaccon.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmsign/simac.h \ @@ -521,18 +449,6 @@ simd5.o: simd5.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h @@ -572,24 +488,13 @@ sinullpr.o: sinullpr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h siprivat.o: siprivat.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsign/siprivat.h ../include/dcmtk/dcmsign/sitypes.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ @@ -625,18 +530,6 @@ siprivat.o: siprivat.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h ../include/dcmtk/dcmsign/sirsa.h \ ../include/dcmtk/dcmsign/sialgo.h ../include/dcmtk/dcmsign/sidsa.h \ ../include/dcmtk/dcmsign/sicert.h @@ -676,18 +569,6 @@ siripemd.o: siripemd.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h @@ -727,18 +608,6 @@ sirsa.o: sirsa.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h ../include/dcmtk/dcmsign/sicert.h \ ../include/dcmtk/dcmsign/siprivat.h sisha1.o: sisha1.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -777,18 +646,6 @@ sisha1.o: sisha1.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h @@ -828,18 +685,6 @@ sisha256.o: sisha256.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h @@ -879,18 +724,6 @@ sisha384.o: sisha384.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h @@ -930,18 +763,6 @@ sisha512.o: sisha512.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h @@ -980,25 +801,20 @@ sisprof.o: sisprof.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ @@ -1044,18 +860,6 @@ sitypes.o: sitypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsign/sidefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h diff --git a/dcmsign/libsrc/simaccon.cc b/dcmsign/libsrc/simaccon.cc index 60104a1f..cdd91a60 100644 --- a/dcmsign/libsrc/simaccon.cc +++ b/dcmsign/libsrc/simaccon.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by diff --git a/dcmsr/apps/Makefile.dep b/dcmsr/apps/Makefile.dep index 0efeca06..83bdc066 100644 --- a/dcmsr/apps/Makefile.dep +++ b/dcmsr/apps/Makefile.dep @@ -43,22 +43,17 @@ dsr2html.o: dsr2html.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -66,6 +61,7 @@ dsr2html.o: dsr2html.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -129,11 +125,18 @@ dsr2html.o: dsr2html.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h dsr2xml.o: dsr2xml.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \ @@ -180,22 +183,17 @@ dsr2xml.o: dsr2xml.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -203,6 +201,7 @@ dsr2xml.o: dsr2xml.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -266,11 +265,18 @@ dsr2xml.o: dsr2xml.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h dsrdump.o: dsrdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \ @@ -317,22 +323,17 @@ dsrdump.o: dsrdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -340,6 +341,7 @@ dsrdump.o: dsrdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -403,11 +405,18 @@ dsrdump.o: dsrdump.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../ofstd/include/dcmtk/ofstd/ofchrenc.h xml2dsr.o: xml2dsr.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \ @@ -454,22 +463,17 @@ xml2dsr.o: xml2dsr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -477,6 +481,7 @@ xml2dsr.o: xml2dsr.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -540,9 +545,16 @@ xml2dsr.o: xml2dsr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcostrmz.h + ../../dcmdata/include/dcmtk/dcmdata/dcostrmz.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h diff --git a/dcmsr/apps/xml2dsr.cc b/dcmsr/apps/xml2dsr.cc index d6fae3e7..83eaeb56 100644 --- a/dcmsr/apps/xml2dsr.cc +++ b/dcmsr/apps/xml2dsr.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2016, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -49,6 +49,25 @@ static char rcsid[] = "$dcmtk: " OFFIS_CONSOLE_APPLICATION " v" #ifdef WITH_LIBXML +#ifdef __ibmxl__ +// IBM xlC defines __GNUC__ but does not support the GNUC extension +// __attribute__ ((format (printf, 2, 3))). +// This avoids a compiler warning in . +#define LIBXML_ATTR_FORMAT(fmt,args) +#endif + +// The libxml library also uses unicode. So we have to reuse some +// workarounds for the ICU library here as well. +// The type char16_t is only supported since C++11. +#ifndef HAVE_CHAR16_T +#define UCHAR_TYPE uint16_t +#endif + +//If U_NOEXCEPT is not defined, ICU falls back to NOEXCEPT. +#ifndef HAVE_CXX11 +#define U_NOEXCEPT +#endif + #include diff --git a/dcmsr/data/dsr2xml.xsd b/dcmsr/data/dsr2xml.xsd index 7b5702dd..1c8b44c7 100644 --- a/dcmsr/data/dsr2xml.xsd +++ b/dcmsr/data/dsr2xml.xsd @@ -10,7 +10,7 @@ XML Schema for DCMTK tools dsr2xml and xml2dsr. - Copyright (C) 2003-2017, OFFIS e.V. + Copyright (C) 2003-2019, OFFIS e.V. and J. Riesmeier All rights reserved. See COPYRIGHT file for details. @@ -31,6 +31,7 @@ + @@ -56,13 +57,21 @@ - + + + + + + + + + @@ -72,6 +81,7 @@ + @@ -725,6 +735,8 @@ + + @@ -815,6 +827,15 @@ + + + + + + + + + @@ -852,6 +873,13 @@ + + + + + + + diff --git a/dcmsr/docs/dsr2html.man b/dcmsr/docs/dsr2html.man index 69853cba..1a62fb1a 100644 --- a/dcmsr/docs/dsr2html.man +++ b/dcmsr/docs/dsr2html.man @@ -232,23 +232,25 @@ code rendering: The \b dsr2html utility supports the following SOP Classes: \verbatim -SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 -MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 -BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 -EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 -ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 -Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 -ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 -MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 -KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 -ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 -XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 -RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 -ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 -ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 -AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 -SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 -PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 +MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 +BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 +EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 +ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 +Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 +ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 +MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 +KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 +ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 +XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 +RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 +ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 +ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 +AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 +SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 +PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 \endverbatim \subsection dsr2html_character_encoding Character Encoding @@ -354,6 +356,6 @@ It is an error if no data dictionary can be loaded. \section dsr2html_copyright COPYRIGHT -Copyright (C) 2000-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2000-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmsr/docs/dsr2xml.man b/dcmsr/docs/dsr2xml.man index 2bcb3e65..233d1168 100644 --- a/dcmsr/docs/dsr2xml.man +++ b/dcmsr/docs/dsr2xml.man @@ -198,23 +198,25 @@ writing: The \b dsr2xml utility supports the following SOP Classes: \verbatim -SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 -MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 -BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 -EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 -ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 -Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 -ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 -MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 -KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 -ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 -XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 -RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 -ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 -ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 -AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 -SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 -PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 +MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 +BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 +EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 +ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 +Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 +ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 +MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 +KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 +ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 +XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 +RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 +ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 +ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 +AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 +SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 +PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 \endverbatim Please note that currently only mandatory and some optional attributes are @@ -255,6 +257,11 @@ latin-1, latin-2, latin-3, latin-4, latin-5, cyrillic, arabic, greek, hebrew. Option \e --convert-to-utf8 can be used to convert the DICOM file or data set to UTF-8 encoding prior to the conversion to XML format. +If no mapping is defined and option \e --convert-to-utf8 is not used, non-ASCII +characters and those below #32 are stored as "&#nnn;" where "nnn" refers to the +numeric character code. This might lead to invalid character entity references +(such as "" for ESC) and will cause most XML parsers to reject the document. + \subsection dsr2xml_error_handling Error Handling Please be careful with the processing options \e --unknown-relationship, @@ -337,6 +344,6 @@ It is an error if no data dictionary can be loaded. \section dsr2xml_copyright COPYRIGHT -Copyright (C) 2000-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2000-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmsr/docs/dsrdump.man b/dcmsr/docs/dsrdump.man index 29e9ed8a..56dac7a3 100644 --- a/dcmsr/docs/dsrdump.man +++ b/dcmsr/docs/dsrdump.man @@ -210,23 +210,25 @@ color: The \b dsrdump utility supports the following SOP Classes: \verbatim -SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 -MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 -BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 -EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 -ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 -Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 -ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 -MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 -KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 -ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 -XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 -RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 -ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 -ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 -AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 -SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 -PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 +MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 +BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 +EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 +ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 +Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 +ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 +MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 +KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 +ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 +XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 +RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 +ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 +ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 +AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 +SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 +PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 \endverbatim \section dsrdump_logging LOGGING @@ -292,6 +294,6 @@ It is an error if no data dictionary can be loaded. \section dsrdump_copyright COPYRIGHT -Copyright (C) 2000-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2000-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmsr/docs/xml2dsr.man b/dcmsr/docs/xml2dsr.man index 65c8a425..e73e6f67 100644 --- a/dcmsr/docs/xml2dsr.man +++ b/dcmsr/docs/xml2dsr.man @@ -1,9 +1,9 @@ /*! \if MANPAGES -\page xml2dsr Convert DICOM SR file and data set to XML +\page xml2dsr Convert XML document to DICOM SR file \else -\page xml2dsr xml2dsr: Convert DICOM SR file and data set to XML +\page xml2dsr xml2dsr: Convert XML document to DICOM SR file \endif \section xml2dsr_synopsis SYNOPSIS @@ -174,23 +174,25 @@ deflate compression level (only with --write-xfer-deflated): The \b xml2dsr utility supports the following SOP Classes: \verbatim -SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 -MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 -BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 -EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 -ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 -Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 -ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 -MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 -KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 -ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 -XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 -RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 -ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 -ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 -AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 -SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 -PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 +MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 +BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 +EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 +ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 +Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 +ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 +MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 +KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 +ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 +XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 +RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 +ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 +ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 +AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 +SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 +PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 \endverbatim Please note that currently only mandatory and some optional attributes are @@ -308,6 +310,6 @@ It is an error if no data dictionary can be loaded. \section xml2dsr_copyright COPYRIGHT -Copyright (C) 2003-2018 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 2003-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid100.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid100.h index 8247b0e2..17017b5d 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid100.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid100.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID100_QuantitativeDiagnosticImagingProcedures * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:12 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:14 by J. Riesmeier * */ @@ -28,7 +28,7 @@ /** Implementation of DCMR Context Group: * CID 100 - Quantitative Diagnostic Imaging Procedures. - * (type: extensible, version: 20141110) + * (type: extensible, version: 20190121) */ class DCMTK_CMR_EXPORT CID100_QuantitativeDiagnosticImagingProcedures : public DSRContextGroup @@ -40,7 +40,9 @@ class DCMTK_CMR_EXPORT CID100_QuantitativeDiagnosticImagingProcedures */ enum EnumType { - /// (P5-09051,SRT,"Magnetic resonance imaging guidance") + /// (363679005,SCT,"Imaging procedure") + ImagingProcedure, + /// (258177008,SCT,"Magnetic resonance imaging guidance") MagneticResonanceImagingGuidance, /// (126020,DCM,"Multiparametric MRI") MultiparametricMRI, @@ -48,20 +50,28 @@ class DCMTK_CMR_EXPORT CID100_QuantitativeDiagnosticImagingProcedures MultiparametricMRIOfProstate, /// (126022,DCM,"Multiparametric MRI of whole body") MultiparametricMRIOfWholeBody, - /// (P5-0907F,SRT,"Dynamic magnetic resonance imaging of knee") + /// (433139009,SCT,"Dynamic magnetic resonance imaging of knee") DynamicMagneticResonanceImagingOfKnee, - /// (P5-70694,SRT,"Dynamic magnetic resonance imaging of pelvis") + /// (446315002,SCT,"Dynamic magnetic resonance imaging of pelvis") DynamicMagneticResonanceImagingOfPelvis, + /// (25045-6,LN,"CT unspecified body region") + CTUnspecifiedBodyRegion, + /// (25056-3,LN,"MRI unspecified body region") + MRIUnspecifiedBodyRegion, + /// (49118-3,LN,"NM unspecified body region") + NMUnspecifiedBodyRegion, + /// (44136-0,LN,"PET unspecified body region") + PETUnspecifiedBodyRegion, /// (44139-4,LN,"PET whole body") PETWholeBody, - /// (P5-080FF,SRT,"PET/CT FDG imaging of whole body") + /// (443271005,SCT,"PET/CT FDG imaging of whole body") PETCT_FDGImagingOfWholeBody, - /// (P5-08118,SRT,"PET/CT MET imaging of whole body") + /// (443844003,SCT,"PET/CT MET imaging of whole body") PETCT_METImagingOfWholeBody, - /// (RPID96,RADLEX,"CT head perfusion with IV contrast") - CTHeadPerfusionWithIVContrast, - /// (RPID5258,RADLEX,"NM head perfusion brain SPECT") - NMHeadPerfusionBrainSPECT, + /// (39142-5,LN,"CT perfusion head with contrast IV") + CTPerfusionHeadWithContrastIV, + /// (39632-5,LN,"SPECT brain") + SPECTBrain, /// (RPID5427,RADLEX,"NM head perfusion brain PET-CT AV-45") NMHeadPerfusionBrainPET_CT_AV45 }; diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h index 08a5baae..b9044e1b 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID10013_CTAcquisitionType * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:35 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:39 by J. Riesmeier * */ @@ -42,7 +42,7 @@ class DCMTK_CMR_EXPORT CID10013_CTAcquisitionType { /// (113804,DCM,"Sequenced Acquisition") SequencedAcquisition, - /// (P5-08001,SRT,"Spiral Acquisition") + /// (116152004,SCT,"Spiral Acquisition") SpiralAcquisition, /// (113805,DCM,"Constant Angle Acquisition") ConstantAngleAcquisition, @@ -50,7 +50,7 @@ class DCMTK_CMR_EXPORT CID10013_CTAcquisitionType StationaryAcquisition, /// (113807,DCM,"Free Acquisition") FreeAcquisition, - /// (R-FB8F1,SRT,"Cone Beam Acquisition") + /// (702569007,SCT,"Cone Beam Acquisition") ConeBeamAcquisition }; diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h index 453c8301..dc4b0209 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID10033_CTReconstructionAlgorithm * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:37 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:41 by J. Riesmeier * */ diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid11.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid11.h index 99b40615..1a7af6e2 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid11.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid11.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID11_RouteOfAdministration * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:07 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:09 by J. Riesmeier * */ @@ -40,55 +40,55 @@ class DCMTK_CMR_EXPORT CID11_RouteOfAdministration */ enum EnumType { - /// (G-D101,SRT,"Intravenous route") + /// (47625008,SCT,"Intravenous route") IntravenousRoute, - /// (G-D102,SRT,"Intra-arterial route") + /// (58100008,SCT,"Intra-arterial route") IntraArterialRoute, - /// (G-D103,SRT,"Intramuscular route") + /// (78421000,SCT,"Intramuscular route") IntramuscularRoute, - /// (G-D104,SRT,"Subcutaneous route") + /// (34206005,SCT,"Subcutaneous route") SubcutaneousRoute, - /// (G-D17D,SRT,"Intracutaneous route") + /// (372464004,SCT,"Intracutaneous route") IntracutaneousRoute, - /// (G-D106,SRT,"Intraperitoneal route") + /// (38239002,SCT,"Intraperitoneal route") IntraperitonealRoute, - /// (G-D107,SRT,"Intramedullary route") + /// (60213007,SCT,"Intramedullary route") IntramedullaryRoute, - /// (G-D108,SRT,"Intrathecal route") + /// (72607000,SCT,"Intrathecal route") IntrathecalRoute, - /// (G-D109,SRT,"Intra-articular route") + /// (12130007,SCT,"Intra-articular route") IntraArticularRoute, /// (C38244,NCIt,"Intraepithelial route") IntraepithelialRoute, - /// (G-D112,SRT,"Topical route") + /// (6064005,SCT,"Topical route") TopicalRoute, - /// (G-D140,SRT,"Oral route") + /// (26643006,SCT,"Oral route") OralRoute, /// (C38306,NCIt,"Transluminal route") TransluminalRoute, - /// (G-D144,SRT,"Intraluminal route") + /// (37737002,SCT,"Intraluminal route") IntraluminalRoute, /// (C38213,NCIt,"Extraluminal route") ExtraluminalRoute, - /// (R-40B32,SRT,"By inhalation") + /// (446406008,SCT,"By inhalation") ByInhalation, - /// (G-D160,SRT,"Per rectum") + /// (37161004,SCT,"Per rectum") PerRectum, - /// (G-D164,SRT,"Vaginal route") + /// (16857009,SCT,"Vaginal route") VaginalRoute, - /// (G-D17C,SRT,"Intracoronary route") + /// (372463005,SCT,"Intracoronary route") IntracoronaryRoute, - /// (G-D173,SRT,"Intracardiac route") + /// (372460008,SCT,"Intracardiac route") IntracardiacRoute, - /// (R-F2C86,SRT,"Intraventricular route - cardiac") + /// (420287000,SCT,"Intraventricular route - cardiac") IntraventricularRouteCardiac, /// (127070,DCM,"Retro-orbital route") RetroOrbitalRoute, - /// (G-D172,SRT,"Nasal route") + /// (46713006,SCT,"Nasal route") NasalRoute, - /// (G-D17D,SRT,"Intradermal route") + /// (372464004,SCT,"Intradermal route") IntradermalRoute, - /// (R-F2CD4,SRT,"Intratumor route") + /// (447122006,SCT,"Intratumor route") IntratumorRoute }; diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid244.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid244.h index d7bee4a0..ac89b3c2 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid244.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid244.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID244_Laterality * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:14 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:16 by J. Riesmeier * */ @@ -40,13 +40,13 @@ class DCMTK_CMR_EXPORT CID244_Laterality */ enum EnumType { - /// (G-A100,SRT,"Right") + /// (24028007,SCT,"Right") Right, - /// (G-A101,SRT,"Left") + /// (7771000,SCT,"Left") Left, - /// (G-A102,SRT,"Right and left") - RightAndLeft, - /// (G-A103,SRT,"Unilateral") + /// (51440002,SCT,"Bilateral") + Bilateral, + /// (66459002,SCT,"Unilateral") Unilateral }; diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid29.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid29.h index 74742e81..c4351d39 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid29.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid29.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID29_AcquisitionModality * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:09 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:11 by J. Riesmeier * */ @@ -28,7 +28,7 @@ /** Implementation of DCMR Context Group: * CID 29 - Acquisition Modality. - * (type: extensible, version: 20180605) + * (type: extensible, version: 20190327) */ class DCMTK_CMR_EXPORT CID29_AcquisitionModality : public DSRContextGroup @@ -42,24 +42,26 @@ class DCMTK_CMR_EXPORT CID29_AcquisitionModality { /// (AR,DCM,"Autorefraction") Autorefraction, - /// (BMD,DCM,"Bone Mineral Densitometry") - BoneMineralDensitometry, /// (BDUS,DCM,"Ultrasound Bone Densitometry") UltrasoundBoneDensitometry, - /// (EPS,DCM,"Cardiac Electrophysiology") - CardiacElectrophysiology, + /// (BI,DCM,"Biomagnetic Imaging") + BiomagneticImaging, + /// (BMD,DCM,"Bone Mineral Densitometry") + BoneMineralDensitometry, /// (CR,DCM,"Computed Radiography") ComputedRadiography, /// (CT,DCM,"Computed Tomography") ComputedTomography, + /// (DG,DCM,"Diaphanography") + Diaphanography, /// (DX,DCM,"Digital Radiography") DigitalRadiography, /// (ECG,DCM,"Electrocardiography") Electrocardiography, + /// (EPS,DCM,"Cardiac Electrophysiology") + CardiacElectrophysiology, /// (ES,DCM,"Endoscopy") Endoscopy, - /// (XC,DCM,"External-camera Photography") - ExternalCameraPhotography, /// (GM,DCM,"General Microscopy") GeneralMicroscopy, /// (HD,DCM,"Hemodynamic Waveform") @@ -74,22 +76,22 @@ class DCMTK_CMR_EXPORT CID29_AcquisitionModality Keratometry, /// (LEN,DCM,"Lensometry") Lensometry, - /// (MR,DCM,"Magnetic Resonance") - MagneticResonance, + /// (LS,DCM,"Laser Scan") + LaserScan, /// (MG,DCM,"Mammography") Mammography, + /// (MR,DCM,"Magnetic Resonance") + MagneticResonance, /// (NM,DCM,"Nuclear Medicine") NuclearMedicine, /// (OAM,DCM,"Ophthalmic Axial Measurements") OphthalmicAxialMeasurements, /// (OCT,DCM,"Optical Coherence Tomography") OpticalCoherenceTomography, - /// (OPM,DCM,"Ophthalmic Mapping") - OphthalmicMapping, /// (OP,DCM,"Ophthalmic Photography") OphthalmicPhotography, - /// (OPR,DCM,"Ophthalmic Refraction") - OphthalmicRefraction, + /// (OPM,DCM,"Ophthalmic Mapping") + OphthalmicMapping, /// (OPT,DCM,"Ophthalmic Tomography") OphthalmicTomography, /// (OPTBSV,DCM,"Ophthalmic Tomography B-scan Volume Analysis") @@ -100,24 +102,32 @@ class DCMTK_CMR_EXPORT CID29_AcquisitionModality OphthalmicVisualField, /// (OSS,DCM,"Optical Surface Scanner") OpticalSurfaceScanner, - /// (PX,DCM,"Panoramic X-Ray") - PanoramicXRay, /// (PT,DCM,"Positron emission tomography") PositronEmissionTomography, + /// (PX,DCM,"Panoramic X-Ray") + PanoramicXRay, + /// (RESP,DCM,"Respiratory Waveform") + RespiratoryWaveform, /// (RF,DCM,"Radiofluoroscopy") Radiofluoroscopy, /// (RG,DCM,"Radiographic imaging") RadiographicImaging, + /// (RTIMAGE,DCM,"RT Image") + RTImage, /// (SM,DCM,"Slide Microscopy") SlideMicroscopy, /// (SRF,DCM,"Subjective Refraction") SubjectiveRefraction, + /// (TG,DCM,"Thermography") + Thermography, /// (US,DCM,"Ultrasound") Ultrasound, /// (VA,DCM,"Visual Acuity") VisualAcuity, /// (XA,DCM,"X-Ray Angiography") - XRayAngiography + XRayAngiography, + /// (XC,DCM,"External-camera Photography") + ExternalCameraPhotography }; /** (default) constructor diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h index b81de5eb..8bc448dd 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID4020_PETRadionuclide * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:15 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:18 by J. Riesmeier * */ @@ -40,75 +40,75 @@ class DCMTK_CMR_EXPORT CID4020_PETRadionuclide */ enum EnumType { - /// (C-105A1,SRT,"^11^Carbon") + /// (40565003,SCT,"^11^Carbon") _11_Carbon, - /// (C-107A1,SRT,"^13^Nitrogen") + /// (21576001,SCT,"^13^Nitrogen") _13_Nitrogen, - /// (C-1018C,SRT,"^14^Oxygen") + /// (424875009,SCT,"^14^Oxygen") _14_Oxygen, - /// (C-B1038,SRT,"^15^Oxygen") + /// (129504001,SCT,"^15^Oxygen") _15_Oxygen, - /// (C-111A1,SRT,"^18^Fluorine") + /// (77004003,SCT,"^18^Fluorine") _18_Fluorine, - /// (C-155A1,SRT,"^22^Sodium") + /// (71633006,SCT,"^22^Sodium") _22_Sodium, - /// (C-135A4,SRT,"^38^Potassium") + /// (423764008,SCT,"^38^Potassium") _38_Potassium, /// (126605,DCM,"^43^Scandium") _43_Scandium, /// (126600,DCM,"^44^Scandium") _44_Scandium, - /// (C-166A2,SRT,"^45^Titanium") + /// (75696008,SCT,"^45^Titanium") _45_Titanium, /// (126601,DCM,"^51^Manganese") _51_Manganese, - /// (C-130A1,SRT,"^52^Iron") + /// (69089000,SCT,"^52^Iron") _52_Iron, - /// (C-149A1,SRT,"^52^Manganese") + /// (37225000,SCT,"^52^Manganese") _52_Manganese, /// (126607,DCM,"^52m^Manganese") _52m_Manganese, - /// (C-127A4,SRT,"^60^Copper") + /// (425364008,SCT,"^60^Copper") _60_Copper, - /// (C-127A1,SRT,"^61^Copper") + /// (71425003,SCT,"^61^Copper") _61_Copper, - /// (C-127A5,SRT,"^62^Copper") + /// (422934004,SCT,"^62^Copper") _62_Copper, - /// (C-141A1,SRT,"^62^Zinc") + /// (65054007,SCT,"^62^Zinc") _62_Zinc, - /// (C-127A2,SRT,"^64^Copper") + /// (3932008,SCT,"^64^Copper") _64_Copper, - /// (C-131A1,SRT,"^66^Gallium") + /// (79477007,SCT,"^66^Gallium") _66_Gallium, - /// (C-131A3,SRT,"^68^Gallium") + /// (35337001,SCT,"^68^Gallium") _68_Gallium, - /// (C-128A2,SRT,"^68^Germanium") + /// (53315004,SCT,"^68^Germanium") _68_Germanium, /// (126602,DCM,"^70^Arsenic") _70_Arsenic, - /// (C-115A2,SRT,"^72^Arsenic") + /// (2705002,SCT,"^72^Arsenic") _72_Arsenic, - /// (C-116A2,SRT,"^73^Selenium") + /// (87437000,SCT,"^73^Selenium") _73_Selenium, - /// (C-113A1,SRT,"^75^Bromine") + /// (17910003,SCT,"^75^Bromine") _75_Bromine, - /// (C-113A2,SRT,"^76^Bromine") + /// (79523006,SCT,"^76^Bromine") _76_Bromine, - /// (C-113A3,SRT,"^77^Bromine") + /// (86521004,SCT,"^77^Bromine") _77_Bromine, - /// (C-159A2,SRT,"^82^Rubidium") + /// (79197006,SCT,"^82^Rubidium") _82_Rubidium, - /// (C-162A3,SRT,"^86^Yttrium") + /// (10738001,SCT,"^86^Yttrium") _86_Yttrium, - /// (C-168A4,SRT,"^89^Zirconium") + /// (63360001,SCT,"^89^Zirconium") _89_Zirconium, /// (126603,DCM,"^90^Niobium") _90_Niobium, - /// (C-162A7,SRT,"^90^Yttrium") + /// (14691008,SCT,"^90^Yttrium") _90_Yttrium, - /// (C-163AA,SRT,"^94m^Technetium") + /// (424079002,SCT,"^94m^Technetium") _94m_Technetium, - /// (C-114A5,SRT,"^124^Iodine") + /// (40937006,SCT,"^124^Iodine") _124_Iodine, /// (126606,DCM,"^152^Terbium") _152_Terbium diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h index 4c27458e..3a3a968e 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID4021_PETRadiopharmaceutical * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:17 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:20 by J. Riesmeier * */ @@ -28,7 +28,7 @@ /** Implementation of DCMR Context Group: * CID 4021 - PET Radiopharmaceutical. - * (type: extensible, version: 20180327) + * (type: extensible, version: 20190124) */ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical : public DSRContextGroup @@ -48,11 +48,11 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical _7D12_89Zr, /// (126750,DCM,"7E11 ^89^Zr") _7E11_89Zr, - /// (C-B1043,SRT,"Acetate C^11^") + /// (129513004,SCT,"Acetate C^11^") Acetate_C11, /// (126729,DCM,"AGN-150998 ^89^Zr") AGN150998_89Zr, - /// (C-B103C,SRT,"Ammonia N^13^") + /// (129508003,SCT,"Ammonia N^13^") Ammonia_N13, /// (126754,DCM,"Anti-B220 ^89^Zr") AntiB220_89Zr, @@ -62,7 +62,7 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical ATSM_Cu61, /// (126702,DCM,"ATSM Cu^62^") ATSM_Cu62, - /// (C-B07DB,SRT,"ATSM Cu^64^") + /// (422855001,SCT,"ATSM Cu^64^") ATSM_Cu64, /// (126722,DCM,"Benralizumab ^89^Zr") Benralizumab_89Zr, @@ -72,15 +72,15 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical Blinatumomab_89Zr, /// (126735,DCM,"Brentuximab ^89^Zr") Brentuximab_89Zr, - /// (C-B07DC,SRT,"Butanol O^15^") + /// (422540000,SCT,"Butanol O^15^") Butanol_O15, - /// (C-B103B,SRT,"Carbon dioxide O^15^") + /// (129507008,SCT,"Carbon dioxide O^15^") CarbonDioxide_O15, - /// (C-B1045,SRT,"Carbon monoxide C^11^") + /// (129515006,SCT,"Carbon monoxide C^11^") CarbonMonoxide_C11, - /// (C-B103A,SRT,"Carbon monoxide O^15^") + /// (129506004,SCT,"Carbon monoxide O^15^") CarbonMonoxide_O15, - /// (C-B103F,SRT,"Carfentanil C^11^") + /// (129511002,SCT,"Carfentanil C^11^") Carfentanil_C11, /// (126513,DCM,"Cetuximab ^89^Zr") Cetuximab_89Zr, @@ -96,6 +96,10 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical CMAbU36_89Zr, /// (126515,DCM,"cU36 ^89^Zr") CU36_89Zr, + /// (C96234,NCIt,"DCFBC F^18^") + DCFBC_F18, + /// (C116352,NCIt,"DCFPyL F^18^") + DCFPyL_F18, /// (126762,DCM,"Df-[FK](2) ^89^Zr") DfFK2_89Zr, /// (126763,DCM,"Df-[FK](2)-3PEG(4) ^89^Zr") @@ -114,7 +118,7 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical Ecromeximab_89Zr, /// (C2713594,UMLS,"Edotreotide Ga^68^") Edotreotide_Ga68, - /// (C-B07DD,SRT,"EDTA Ga^68^") + /// (423498000,SCT,"EDTA Ga^68^") EDTA_Ga68, /// (126704,DCM,"Fallypride C^11^") Fallypride_C11, @@ -122,57 +126,59 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical Fallypride_F18, /// (126706,DCM,"FLB 457 C^11^") FLB457_C11, - /// (C-D6858,SRT,"Florbetaben F^18^") + /// (712736002,SCT,"Florbetaben F^18^") Florbetaben_F18, - /// (C-E0269,SRT,"Florbetapir F^18^") + /// (456995000,SCT,"Florbetapir F^18^") Florbetapir_F18, + /// (C4547429,UMLS,"Flortaucipir F^18^") + Flortaucipir_F18, /// (126503,DCM,"Flubatine F^18^") Flubatine_F18, - /// (C-E0265,SRT,"Fluciclatide F^18^") + /// (456999006,SCT,"Fluciclatide F^18^") Fluciclatide_F18, - /// (C-E026A,SRT,"Fluciclovine F^18^") + /// (457000009,SCT,"Fluciclovine F^18^") Fluciclovine_F18, - /// (C-B07DE,SRT,"Flumazenil C^11^") + /// (423543007,SCT,"Flumazenil C^11^") Flumazenil_C11, - /// (C-B07DF,SRT,"Flumazenil F^18^") + /// (422975006,SCT,"Flumazenil F^18^") Flumazenil_F18, - /// (C-B07E0,SRT,"Fluorethyltyrosin F^18^") + /// (424708001,SCT,"Fluorethyltyrosin F^18^") Fluorethyltyrosin_F18, - /// (C-B07E4,SRT,"Fluorobenzothiazole F^18^") + /// (423546004,SCT,"Fluorobenzothiazole F^18^") Fluorobenzothiazole_F18, - /// (C-E0273,SRT,"Fluorocholine F^18^") + /// (456992002,SCT,"Fluorocholine F^18^") Fluorocholine_F18, - /// (C-B1031,SRT,"Fluorodeoxyglucose F^18^") + /// (35321007,SCT,"Fluorodeoxyglucose F^18^") Fluorodeoxyglucose_F18, /// (C1831937,UMLS,"Fluoroestradiol (FES) F^18^") FluoroestradiolFES_F18, /// (C1541539,UMLS,"Fluoroetanidazole F^18^") Fluoroetanidazole_F18, - /// (C-B1034,SRT,"Fluoro-L-dopa F^18^") + /// (129500005,SCT,"Fluoro-L-dopa F^18^") FluoroLDopa_F18, - /// (C-B07E2,SRT,"Fluoromethane F^18^") + /// (422763008,SCT,"Fluoromethane F^18^") Fluoromethane_F18, - /// (C-B07E1,SRT,"Fluoromisonidazole F^18^") + /// (422598008,SCT,"Fluoromisonidazole F^18^") Fluoromisonidazole_F18, /// (C2934038,UMLS,"Fluoropropyl-dihydrotetrabenazine (DTBZ) F^18^") FluoropropylDihydrotetrabenazineDTBZ_F18, /// (126707,DCM,"Fluorotriopride F^18^") Fluorotriopride_F18, - /// (C-B07E3,SRT,"Fluorouracil F^18^") + /// (425236000,SCT,"Fluorouracil F^18^") Fluorouracil_F18, /// (126718,DCM,"Flurpiridaz F^18^") Flurpiridaz_F18, - /// (C-E0267,SRT,"Flutemetamol F^18^") + /// (456997008,SCT,"Flutemetamol F^18^") Flutemetamol_F18, /// (126748,DCM,"Fresolimumab ^89^Zr") Fresolimumab_89Zr, /// (126731,DCM,"GA201 ^89^Zr") GA201_89Zr, - /// (C-B1046,SRT,"Germanium Ge^68^") + /// (129516007,SCT,"Germanium Ge^68^") Germanium_Ge68, /// (126724,DCM,"Glembatumumab vedotin ^89^Zr") GlembatumumabVedotin_89Zr, - /// (C-B103D,SRT,"Glutamate N^13^") + /// (129509006,SCT,"Glutamate N^13^") Glutamate_N13, /// (126709,DCM,"Glutamine C^11^") Glutamine_C11, @@ -188,17 +194,19 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical Margetuximab_89Zr, /// (126730,DCM,"MEDI-551 ^89^Zr") MEDI551_89Zr, - /// (C-B07E5,SRT,"Mespiperone C^11^") + /// (424789007,SCT,"Mespiperone C^11^") Mespiperone_C11, - /// (C-B103E,SRT,"Methionine C^11^") + /// (129510001,SCT,"Methionine C^11^") Methionine_C11, + /// (C4506764,UMLS,"MK-6240 F^18^") + MK6240_F18, /// (126738,DCM,"Mogamulizumab ^89^Zr") Mogamulizumab_89Zr, /// (126510,DCM,"Monoclonal Antibody (mAb) ^64^Cu") MonoclonalAntibodymAb_64Cu, /// (126511,DCM,"Monoclonal Antibody (mAb) ^89^Zr") MonoclonalAntibodymAb_89Zr, - /// (C-B07E6,SRT,"Monoclonal antibody I^124^") + /// (424874008,SCT,"Monoclonal antibody I^124^") MonoclonalAntibody_I124, /// (126753,DCM,"Nanocolloidal albumin ^89^Zr") NanocolloidalAlbumin_89Zr, @@ -208,11 +216,11 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical Obinituzimab_89Zr, /// (126723,DCM,"Ocaratuzumab ^89^Zr") Ocaratuzumab_89Zr, - /// (C-B1038,SRT,"Oxygen O^15^") + /// (129504001,SCT,"Oxygen O^15^") Oxygen_O15, - /// (C-B1039,SRT,"Oxygen-water O^15^") + /// (129505000,SCT,"Oxygen-water O^15^") OxygenWater_O15, - /// (C-B1044,SRT,"Palmitate C^11^") + /// (129514005,SCT,"Palmitate C^11^") Palmitate_C11, /// (126736,DCM,"Panitumumab ^89^Zr") Panitumumab_89Zr, @@ -224,11 +232,17 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical PittsburghCompoundB_C11, /// (126726,DCM,"Polatuzumab vedotin ^89^Zr") PolatuzumabVedotin_89Zr, - /// (C-B07E7,SRT,"PTSM Cu^62^") + /// (126758,DCM,"PSMA-1007 F^18^") + PSMA1007_F18, + /// (C118961,NCIt,"PSMA-11 Ga^68^") + PSMA11_Ga68, + /// (126759,DCM,"PSMA-617 Ga^68^") + PSMA617_Ga68, + /// (422789008,SCT,"PTSM Cu^62^") PTSM_Cu62, /// (126518,DCM,"R1507 ^89^Zr") R1507_89Zr, - /// (C-B1042,SRT,"Raclopride C^11^") + /// (129512009,SCT,"Raclopride C^11^") Raclopride_C11, /// (126742,DCM,"Ranibizumab ^89^Zr") Ranibizumab_89Zr, @@ -238,25 +252,35 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical RO5323441_89Zr, /// (126756,DCM,"RO542908 ^89^Zr") RO542908_89Zr, + /// (126719,DCM,"RO6924963 ^11^C") + RO6924963_11C, + /// (126720,DCM,"RO6931643 ^11^C") + RO6931643_11C, + /// (126757,DCM,"RO6958948 ^18^F") + RO6958948_18F, /// (126733,DCM,"Roledumab ^89^Zr") Roledumab_89Zr, - /// (C-B1037,SRT,"Rubidium chloride Rb^82^") + /// (129503007,SCT,"Rubidium chloride Rb^82^") RubidiumChloride_Rb82, /// (126741,DCM,"SAR3419 ^89^Zr") SAR3419_89Zr, - /// (C-B1032,SRT,"Sodium fluoride F^18^") + /// (C122684,NCIt,"Sarcosine C^11^") + Sarcosine_C11, + /// (129501009,SCT,"Sodium fluoride F^18^") SodiumFluoride_F18, - /// (C-B07E8,SRT,"Sodium iodide I^124^") + /// (422980002,SCT,"Sodium iodide I^124^") SodiumIodide_I124, - /// (C-B1047,SRT,"Sodium Na^22^") + /// (129517003,SCT,"Sodium Na^22^") Sodium_Na22, - /// (C-B1033,SRT,"Spiperone F^18^") + /// (129499001,SCT,"Spiperone F^18^") Spiperone_F18, /// (126502,DCM,"T807 F^18^") T807_F18, - /// (126717,DCM,"THK5351 F^18^") + /// (C4550127,UMLS,"THK5317 F^18^") + THK5317_F18, + /// (C4279748,UMLS,"THK5351 F^18^") THK5351_F18, - /// (C-B1036,SRT,"Thymidine (FLT) F^18^") + /// (129502002,SCT,"Thymidine (FLT) F^18^") ThymidineFLT_F18, /// (126512,DCM,"Trastuzumab ^89^Zr") Trastuzumab_89Zr, @@ -266,12 +290,10 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical Tyrosine3Octreotate_Ga68, /// (126739,DCM,"Ublituximab ^89^Zr") Ublituximab_89Zr, + /// (C4506788,UMLS,"UCB-J C^11^") + UCBJ_C11, /// (126734,DCM,"XmAb5574 ^89^Zr") - XmAb5574_89Zr, - /// (C118961,NCIt,"PSMA Ga^68^") - PSMA_Ga68, - /// (C122684,NCIt,"Sarcosine C^11^") - Sarcosine_C11 + XmAb5574_89Zr }; /** (default) constructor diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h index d25a2298..d82bf0ba 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID4031_CommonAnatomicRegions * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:19 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:22 by J. Riesmeier * */ @@ -40,219 +40,219 @@ class DCMTK_CMR_EXPORT CID4031_CommonAnatomicRegions */ enum EnumType { - /// (T-D4000,SRT,"Abdomen") + /// (113345001,SCT,"Abdomen") Abdomen, - /// (R-FAB57,SRT,"Abdomen and Pelvis") + /// (416949008,SCT,"Abdomen and Pelvis") AbdomenAndPelvis, - /// (T-15420,SRT,"Acromioclavicular joint") + /// (85856004,SCT,"Acromioclavicular joint") AcromioclavicularJoint, - /// (T-15750,SRT,"Ankle joint") + /// (70258002,SCT,"Ankle joint") AnkleJoint, - /// (T-59900,SRT,"Anus") + /// (53505006,SCT,"Anus") Anus, - /// (T-280A0,SRT,"Apex of Lung") + /// (86598002,SCT,"Apex of Lung") ApexOfLung, - /// (T-60610,SRT,"Bile duct") + /// (28273000,SCT,"Bile duct") BileDuct, - /// (T-74000,SRT,"Bladder") + /// (89837001,SCT,"Bladder") Bladder, - /// (T-12700,SRT,"Bone of lower limb") + /// (72001000,SCT,"Bone of lower limb") BoneOfLowerLimb, - /// (T-D0821,SRT,"Bone of upper limb") + /// (371195002,SCT,"Bone of upper limb") BoneOfUpperLimb, - /// (T-04000,SRT,"Breast") + /// (76752008,SCT,"Breast") Breast, - /// (T-26000,SRT,"Bronchus") + /// (955009,SCT,"Bronchus") Bronchus, - /// (T-12770,SRT,"Calcaneus") + /// (80144004,SCT,"Calcaneus") Calcaneus, - /// (T-11501,SRT,"Cervical spine") + /// (122494005,SCT,"Cervical spine") CervicalSpine, - /// (T-D00F7,SRT,"Cervico-thoracic spine") + /// (297171002,SCT,"Cervico-thoracic spine") CervicoThoracicSpine, - /// (T-D3000,SRT,"Chest") + /// (51185008,SCT,"Chest") Chest, - /// (R-FAB55,SRT,"Chest and Abdomen") + /// (416550000,SCT,"Chest and Abdomen") ChestAndAbdomen, - /// (R-FAB56,SRT,"Chest, Abdomen and Pelvis") + /// (416775004,SCT,"Chest, Abdomen and Pelvis") ChestAbdomenAndPelvis, - /// (T-12310,SRT,"Clavicle") + /// (51299004,SCT,"Clavicle") Clavicle, - /// (T-11BF0,SRT,"Coccyx") + /// (64688005,SCT,"Coccyx") Coccyx, - /// (T-59300,SRT,"Colon") + /// (71854001,SCT,"Colon") Colon, - /// (T-58200,SRT,"Duodenum") + /// (38848004,SCT,"Duodenum") Duodenum, - /// (T-15430,SRT,"Elbow joint") + /// (16953009,SCT,"Elbow joint") ElbowJoint, - /// (T-D0010,SRT,"Entire body") + /// (38266002,SCT,"Entire body") EntireBody, - /// (T-56000,SRT,"Esophagus") + /// (32849002,SCT,"Esophagus") Esophagus, - /// (T-DD163,SRT,"Esophagus, stomach and duodenum") + /// (110861005,SCT,"Esophagus, stomach and duodenum") EsophagusStomachAndDuodenum, - /// (T-D0300,SRT,"Extremity") + /// (66019005,SCT,"Extremity") Extremity, - /// (T-AA000,SRT,"Eye") + /// (81745001,SCT,"Eye") Eye, - /// (T-D0801,SRT,"Eye region") + /// (371398005,SCT,"Eye region") EyeRegion, - /// (T-11196,SRT,"Facial bones") + /// (91397008,SCT,"Facial bones") FacialBones, - /// (T-12710,SRT,"Femur") + /// (71341001,SCT,"Femur") Femur, - /// (T-12750,SRT,"Fibula") + /// (87342007,SCT,"Fibula") Fibula, - /// (T-D8800,SRT,"Finger") + /// (7569003,SCT,"Finger") Finger, - /// (T-D9700,SRT,"Foot") + /// (56459004,SCT,"Foot") Foot, - /// (T-D8500,SRT,"Forearm") + /// (14975008,SCT,"Forearm") Forearm, - /// (T-63000,SRT,"Gallbladder") + /// (28231008,SCT,"Gallbladder") Gallbladder, - /// (T-D8700,SRT,"Hand") + /// (85562004,SCT,"Hand") Hand, - /// (T-D1100,SRT,"Head") + /// (69536005,SCT,"Head") Head, - /// (T-D1000,SRT,"Head and Neck") + /// (774007,SCT,"Head and Neck") HeadAndNeck, - /// (T-32000,SRT,"Heart") + /// (80891009,SCT,"Heart") Heart, - /// (T-15710,SRT,"Hip joint") + /// (29836001,SCT,"Hip joint") HipJoint, - /// (T-12410,SRT,"Humerus") + /// (85050009,SCT,"Humerus") Humerus, - /// (T-58600,SRT,"Ileum") + /// (34516001,SCT,"Ileum") Ileum, - /// (T-12340,SRT,"Ilium") + /// (22356005,SCT,"Ilium") Ilium, - /// (T-AB959,SRT,"Internal Auditory Canal") + /// (361078006,SCT,"Internal Auditory Canal") InternalAuditoryCanal, - /// (T-D1213,SRT,"Jaw region") + /// (661005,SCT,"Jaw region") JawRegion, - /// (T-58400,SRT,"Jejunum") + /// (21306003,SCT,"Jejunum") Jejunum, - /// (T-D9200,SRT,"Knee") + /// (72696002,SCT,"Knee") Knee, - /// (T-59000,SRT,"Large intestine") + /// (14742008,SCT,"Large intestine") LargeIntestine, - /// (T-24100,SRT,"Larynx") + /// (4596009,SCT,"Larynx") Larynx, - /// (T-D9400,SRT,"Lower leg") + /// (30021000,SCT,"Lower leg") LowerLeg, - /// (T-D9000,SRT,"Lower limb") + /// (61685007,SCT,"Lower limb") LowerLimb, - /// (T-11503,SRT,"Lumbar spine") + /// (122496007,SCT,"Lumbar spine") LumbarSpine, - /// (T-D00F9,SRT,"Lumbo-sacral spine") + /// (297173004,SCT,"Lumbo-sacral spine") LumboSacralSpine, - /// (T-11180,SRT,"Mandible") + /// (91609006,SCT,"Mandible") Mandible, - /// (T-11133,SRT,"Mastoid bone") + /// (59066005,SCT,"Mastoid bone") MastoidBone, - /// (T-11170,SRT,"Maxilla") + /// (70925003,SCT,"Maxilla") Maxilla, - /// (T-D3300,SRT,"Mediastinum") + /// (72410000,SCT,"Mediastinum") Mediastinum, - /// (T-14668,SRT,"Muscle of lower limb") + /// (102292000,SCT,"Muscle of lower limb") MuscleOfLowerLimb, - /// (T-13600,SRT,"Muscle of upper limb") + /// (30608006,SCT,"Muscle of upper limb") MuscleOfUpperLimb, - /// (T-11149,SRT,"Nasal bone") + /// (74386004,SCT,"Nasal bone") NasalBone, - /// (T-D1600,SRT,"Neck") + /// (45048000,SCT,"Neck") Neck, - /// (R-FAB52,SRT,"Neck and Chest") + /// (417437006,SCT,"Neck and Chest") NeckAndChest, - /// (R-FAB53,SRT,"Neck, Chest and Abdomen") + /// (416152001,SCT,"Neck, Chest and Abdomen") NeckChestAndAbdomen, - /// (R-FAB54,SRT,"Neck, Chest, Abdomen and Pelvis") + /// (416319003,SCT,"Neck, Chest, Abdomen and Pelvis") NeckChestAbdomenAndPelvis, - /// (T-11102,SRT,"Optic canal") + /// (55024004,SCT,"Optic canal") OpticCanal, - /// (T-D14AE,SRT,"Orbital structure") + /// (363654007,SCT,"Orbital structure") OrbitalStructure, - /// (T-65600,SRT,"Pancreatic duct and bile duct systems") + /// (110621006,SCT,"Pancreatic duct and bile duct systems") PancreaticDuctAndBileDuctSystems, - /// (T-22000,SRT,"Paranasal sinus") + /// (2095001,SCT,"Paranasal sinus") ParanasalSinus, - /// (T-61100,SRT,"Parotid gland") + /// (45289007,SCT,"Parotid gland") ParotidGland, - /// (T-12730,SRT,"Patella") + /// (64234005,SCT,"Patella") Patella, - /// (T-D6000,SRT,"Pelvis") + /// (12921003,SCT,"Pelvis") Pelvis, - /// (R-FAB58,SRT,"Pelvis and lower extremities") + /// (416631005,SCT,"Pelvis and lower extremities") PelvisAndLowerExtremities, /// (113681,DCM,"Phantom") Phantom, - /// (T-92000,SRT,"Prostate") + /// (41216001,SCT,"Prostate") Prostate, - /// (T-59600,SRT,"Rectum") + /// (34402009,SCT,"Rectum") Rectum, - /// (T-11300,SRT,"Rib") + /// (113197003,SCT,"Rib") Rib, - /// (T-15680,SRT,"Sacroiliac joint") + /// (39723000,SCT,"Sacroiliac joint") SacroiliacJoint, - /// (T-11AD0,SRT,"Sacrum") + /// (54735007,SCT,"Sacrum") Sacrum, - /// (T-12280,SRT,"Scapula") + /// (79601000,SCT,"Scapula") Scapula, - /// (T-D1460,SRT,"Sella turcica") + /// (42575006,SCT,"Sella turcica") SellaTurcica, - /// (T-12980,SRT,"Sesamoid bones of foot") + /// (58742003,SCT,"Sesamoid bones of foot") SesamoidBonesOfFoot, - /// (T-D2220,SRT,"Shoulder") + /// (16982005,SCT,"Shoulder") Shoulder, - /// (T-11100,SRT,"Skull") + /// (89546000,SCT,"Skull") Skull, - /// (T-58000,SRT,"Small intestine") + /// (30315005,SCT,"Small intestine") SmallIntestine, - /// (T-D04FF,SRT,"Spine") + /// (421060004,SCT,"Spine") Spine, - /// (T-15610,SRT,"Sternoclavicular joint") + /// (7844006,SCT,"Sternoclavicular joint") SternoclavicularJoint, - /// (T-11210,SRT,"Sternum") + /// (56873002,SCT,"Sternum") Sternum, - /// (T-57000,SRT,"Stomach") + /// (69695003,SCT,"Stomach") Stomach, - /// (T-61300,SRT,"Submandibular gland") + /// (54019009,SCT,"Submandibular gland") SubmandibularGland, - /// (T-15770,SRT,"Tarsal joint") + /// (27949001,SCT,"Tarsal joint") TarsalJoint, - /// (T-15290,SRT,"Temporomandibular joint") + /// (53620006,SCT,"Temporomandibular joint") TemporomandibularJoint, - /// (T-D9100,SRT,"Thigh") + /// (68367000,SCT,"Thigh") Thigh, - /// (T-11502,SRT,"Thoracic spine") + /// (122495006,SCT,"Thoracic spine") ThoracicSpine, - /// (T-D00F8,SRT,"Thoraco-lumbar spine") + /// (297172009,SCT,"Thoraco-lumbar spine") ThoracoLumbarSpine, - /// (T-D8810,SRT,"Thumb") + /// (76505004,SCT,"Thumb") Thumb, - /// (T-D9800,SRT,"Toe") + /// (29707007,SCT,"Toe") Toe, - /// (T-25000,SRT,"Trachea") + /// (44567001,SCT,"Trachea") Trachea, - /// (T-D8200,SRT,"Upper arm") + /// (40983000,SCT,"Upper arm") UpperArm, - /// (T-D8000,SRT,"Upper limb") + /// (53120007,SCT,"Upper limb") UpperLimb, - /// (T-7000B,SRT,"Upper urinary tract") + /// (431491007,SCT,"Upper urinary tract") UpperUrinaryTract, - /// (T-73000,SRT,"Ureter") + /// (87953007,SCT,"Ureter") Ureter, - /// (T-75000,SRT,"Urethra") + /// (13648007,SCT,"Urethra") Urethra, - /// (T-88920,SRT,"Uterus and fallopian tubes") + /// (110639002,SCT,"Uterus and fallopian tubes") UterusAndFallopianTubes, - /// (T-11011,SRT,"Vertebral column and cranium") + /// (110517009,SCT,"Vertebral column and cranium") VertebralColumnAndCranium, - /// (T-15460,SRT,"Wrist joint") + /// (74670003,SCT,"Wrist joint") WristJoint, - /// (T-11166,SRT,"Zygoma") + /// (13881006,SCT,"Zygoma") Zygoma }; diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid42.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid42.h index 081eea15..feb3501d 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid42.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid42.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID42_NumericValueQualifier * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:10 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:12 by J. Riesmeier * */ diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h index 1137f913..4c51a00f 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID6147_ResponseCriteria * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:21 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:24 by J. Riesmeier * */ diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h index 8eecf80e..2f2e0053 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID7021_MeasurementReportDocumentTitles * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:22 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:26 by J. Riesmeier * */ diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h index 0f47014d..4a539f58 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID7181_AbstractMultiDimensionalImageModelComponentUnits * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:24 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:28 by J. Riesmeier * */ diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h index 7ba8d3b7..bc33721b 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID7445_DeviceParticipatingRoles * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:26 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:30 by J. Riesmeier * */ diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h index d022f064..84603773 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID7452_OrganizationalRoles * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:28 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:32 by J. Riesmeier * */ @@ -40,9 +40,9 @@ class DCMTK_CMR_EXPORT CID7452_OrganizationalRoles */ enum EnumType { - /// (J-0016E,SRT,"Medical Practitioner") + /// (158965000,SCT,"Medical Practitioner") MedicalPractitioner, - /// (J-004E8,SRT,"Physician") + /// (309343006,SCT,"Physician") Physician, /// (128670,DCM,"Head of Radiology") HeadOfRadiology, @@ -56,33 +56,33 @@ class DCMTK_CMR_EXPORT CID7452_OrganizationalRoles HeadOfCardiology, /// (128673,DCM,"Administrator of Radiology Department") AdministratorOfRadiologyDepartment, - /// (J-07100,SRT,"Nurse") + /// (106292003,SCT,"Nurse") Nurse, - /// (J-00187,SRT,"Radiologic Technologist") + /// (159016003,SCT,"Radiologic Technologist") RadiologicTechnologist, /// (128674,DCM,"Lead Radiologic Technologist") LeadRadiologicTechnologist, - /// (J-06173,SRT,"Radiation Therapist") + /// (3430008,SCT,"Radiation Therapist") RadiationTherapist, - /// (J-00187,SRT,"Radiographer") + /// (159016003,SCT,"Radiographer") Radiographer, /// (C1144859,UMLS,"Intern") Intern, - /// (J-005E6,SRT,"Resident") + /// (405277009,SCT,"Resident") Resident, - /// (J-00172,SRT,"Registrar") + /// (158971006,SCT,"Registrar") Registrar, /// (121088,DCM,"Fellow") Fellow, - /// (J-005E8,SRT,"Attending") + /// (405279007,SCT,"Attending") Attending, - /// (J-0050A,SRT,"Consultant") + /// (309390008,SCT,"Consultant") Consultant, /// (C1441532,UMLS,"Consulting Physician") ConsultingPhysician, - /// (J-0714A,SRT,"Scrub nurse") + /// (415506007,SCT,"Scrub nurse") ScrubNurse, - /// (J-00556,SRT,"Surgeon") + /// (304292004,SCT,"Surgeon") Surgeon, /// (121092,DCM,"Sonologist") Sonologist, diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h index 7d90c359..9536a07c 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID7453_PerformingRoles * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:29 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:33 by J. Riesmeier * */ @@ -52,7 +52,7 @@ class DCMTK_CMR_EXPORT CID7453_PerformingRoles Verifying, /// (121099,DCM,"Assisting") Assisting, - /// (J-0714B,SRT,"Circulating Nurse") + /// (413854007,SCT,"Circulating Nurse") CirculatingNurse, /// (121101,DCM,"Standby") Standby, diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h index 236f45d6..4edd30a0 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID7464_GeneralRegionOfInterestMeasurementModifiers * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:31 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:35 by J. Riesmeier * */ @@ -40,19 +40,19 @@ class DCMTK_CMR_EXPORT CID7464_GeneralRegionOfInterestMeasurementModifiers */ enum EnumType { - /// (G-A437,SRT,"Maximum"), included from CID 3488 + /// (56851009,SCT,"Maximum"), included from CID 3488 Maximum, - /// (R-404FB,SRT,"Minimum"), included from CID 3488 + /// (255605001,SCT,"Minimum"), included from CID 3488 Minimum, - /// (R-00317,SRT,"Mean"), included from CID 3488 + /// (373098007,SCT,"Mean"), included from CID 3488 Mean, - /// (R-10047,SRT,"Standard Deviation") + /// (386136009,SCT,"Standard Deviation") StandardDeviation, - /// (R-40507,SRT,"Total") + /// (255619001,SCT,"Total") Total, - /// (R-00319,SRT,"Median") + /// (373099004,SCT,"Median") Median, - /// (R-0032E,SRT,"Mode") + /// (373100007,SCT,"Mode") Mode, /// (126031,DCM,"Peak Value Within ROI") PeakValueWithinROI, diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h index 6840d8df..2d38e554 100644 --- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h +++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file for class CID7469_GenericIntensityAndSizeMeasurements * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:33 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:37 by J. Riesmeier * */ @@ -40,29 +40,29 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements */ enum EnumType { - /// (F-65C50,SRT,"N-acetylaspartate"), included from CID 4033 + /// (115391007,SCT,"N-acetylaspartate"), included from CID 4033 NAcetylaspartate, - /// (F-61080,SRT,"Citrate"), included from CID 4033 + /// (59351004,SCT,"Citrate"), included from CID 4033 Citrate, - /// (F-61620,SRT,"Choline"), included from CID 4033 + /// (65123005,SCT,"Choline"), included from CID 4033 Choline, - /// (F-61380,SRT,"Creatine"), included from CID 4033 + /// (14804005,SCT,"Creatine"), included from CID 4033 Creatine, /// (113094,DCM,"Creatine and Choline"), included from CID 4033 CreatineAndCholine, - /// (F-61760,SRT,"Lactate"), included from CID 4033 + /// (83036002,SCT,"Lactate"), included from CID 4033 Lactate, - /// (F-63600,SRT,"Lipid"), included from CID 4033 + /// (70106000,SCT,"Lipid"), included from CID 4033 Lipid, /// (113095,DCM,"Lipid and Lactate"), included from CID 4033 LipidAndLactate, /// (113080,DCM,"Glutamate and glutamine"), included from CID 4033 GlutamateAndGlutamine, - /// (F-64210,SRT,"Glutamine"), included from CID 4033 + /// (25761002,SCT,"Glutamine"), included from CID 4033 Glutamine, - /// (F-64460,SRT,"Tuarine"), included from CID 4033 + /// (10944007,SCT,"Tuarine"), included from CID 4033 Tuarine, - /// (F-61A90,SRT,"Inositol"), included from CID 4033 + /// (72164009,SCT,"Inositol"), included from CID 4033 Inositol, /// (113081,DCM,"Choline/Creatine Ratio"), included from CID 4033 CholinePerCreatineRatio, @@ -172,7 +172,7 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements TissueVelocity, /// (110828,DCM,"Flow Velocity"), included from CID 7180 FlowVelocity, - /// (P0-02241,SRT,"Power Doppler"), included from CID 7180 + /// (425704008,SCT,"Power Doppler"), included from CID 7180 PowerDoppler, /// (110829,DCM,"Flow Variance"), included from CID 7180 FlowVariance, @@ -262,14 +262,14 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements Tau_m, /// (126331,DCM,"vp"), included from CID 4107 Vp, - /// (113055,DCM,"Regional Cerebral Blood Flow"), included from CID 4108 - RegionalCerebralBloodFlow, - /// (126390,DCM,"Regional Blood Flow"), included from CID 4108 - RegionalBloodFlow, - /// (113056,DCM,"Regional Cerebral Blood Volume"), included from CID 4108 - RegionalCerebralBloodVolume, - /// (126391,DCM,"Regional Blood Volume"), included from CID 4108 - RegionalBloodVolume, + /// (126390,DCM,"Absolute Regional Blood Flow"), included from CID 4108 + AbsoluteRegionalBloodFlow, + /// (126391,DCM,"Absolute Regional Blood Volume"), included from CID 4108 + AbsoluteRegionalBloodVolume, + /// (126397,DCM,"Relative Regional Blood Flow"), included from CID 4108 + RelativeRegionalBloodFlow, + /// (126398,DCM,"Relative Regional Blood Volume"), included from CID 4108 + RelativeRegionalBloodVolume, /// (113052,DCM,"Mean Transit Time"), included from CID 4108 MeanTransitTime, /// (113069,DCM,"Time To Peak"), included from CID 4108 @@ -326,7 +326,7 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements AbsorbedDose, /// (128512,DCM,"Equivalent Dose"), included from CID 10070 EquivalentDose, - /// (T-D008A,SRT,"Fat"), included from CID 7180 + /// (256674009,SCT,"Fat"), included from CID 7180 Fat, /// (129100,DCM,"Fat fraction"), included from CID 7180 FatFraction, @@ -342,47 +342,59 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements SignalToNoise, /// (113066,DCM,"Time course of signal"), included from CID 7180 TimeCourseOfSignal, - /// (C-10120,SRT,"Water"), included from CID 7180 + /// (11713004,SCT,"Water"), included from CID 7180 Water, /// (129103,DCM,"Water fraction"), included from CID 7180 WaterFraction, - /// (G-D7FE,SRT,"Length"), included from CID 7470 + /// (130086,DCM,"Relative Linear Stopping Power"), included from CID 7180 + RelativeLinearStoppingPower, + /// (410668003,SCT,"Length"), included from CID 7470 Length, /// (121211,DCM,"Path length"), included from CID 7470 PathLength, /// (121206,DCM,"Distance"), included from CID 7470 Distance, - /// (G-A220,SRT,"Width"), included from CID 7470 + /// (103355008,SCT,"Width"), included from CID 7470 Width, - /// (G-D785,SRT,"Depth"), included from CID 7470 + /// (131197000,SCT,"Depth"), included from CID 7470 Depth, - /// (M-02550,SRT,"Diameter"), included from CID 7470 + /// (81827009,SCT,"Diameter"), included from CID 7470 Diameter, - /// (G-A185,SRT,"Long Axis"), included from CID 7470 + /// (103339001,SCT,"Long Axis"), included from CID 7470 LongAxis, - /// (G-A186,SRT,"Short Axis"), included from CID 7470 + /// (103340004,SCT,"Short Axis"), included from CID 7470 ShortAxis, - /// (G-A193,SRT,"Major Axis"), included from CID 7470 + /// (131187009,SCT,"Major Axis"), included from CID 7470 MajorAxis, - /// (G-A194,SRT,"Minor Axis"), included from CID 7470 + /// (131188004,SCT,"Minor Axis"), included from CID 7470 MinorAxis, - /// (G-A195,SRT,"Perpendicular Axis"), included from CID 7470 + /// (131189007,SCT,"Perpendicular Axis"), included from CID 7470 PerpendicularAxis, - /// (G-A196,SRT,"Radius"), included from CID 7470 + /// (131190003,SCT,"Radius"), included from CID 7470 Radius, - /// (G-A197,SRT,"Perimeter"), included from CID 7470 + /// (131191004,SCT,"Perimeter"), included from CID 7470 Perimeter, - /// (M-02560,SRT,"Circumference"), included from CID 7470 + /// (74551000,SCT,"Circumference"), included from CID 7470 Circumference, - /// (G-A198,SRT,"Diameter of circumscribed circle"), included from CID 7470 + /// (131192006,SCT,"Diameter of circumscribed circle"), included from CID 7470 DiameterOfCircumscribedCircle, /// (121207,DCM,"Height"), included from CID 7470 Height, - /// (G-A166,SRT,"Area"), included from CID 7471 + /// (L0JK,IBSI,"Maximum 3D Diameter of a Mesh"), included from CID 7470 + Maximum3DDiameterOfAMesh, + /// (TDIC,IBSI,"Major Axis in 3D Length"), included from CID 7470 + MajorAxisIn3DLength, + /// (P9VJ,IBSI,"Minor Axis in 3D Length"), included from CID 7470 + MinorAxisIn3DLength, + /// (7J51,IBSI,"Least Axis in 3D Length"), included from CID 7470 + LeastAxisIn3DLength, + /// (42798000,SCT,"Area"), included from CID 7471 Area, - /// (G-A16A,SRT,"Area of defined region"), included from CID 7471 + /// (131184002,SCT,"Area of defined region"), included from CID 7471 AreaOfDefinedRegion, - /// (G-D705,SRT,"Volume"), included from CID 7472 + /// (C0JK,IBSI,"Surface Area of Mesh"), included from CID 7471 + SurfaceAreaOfMesh, + /// (118565006,SCT,"Volume"), included from CID 7472 Volume, /// (121216,DCM,"Volume estimated from single 2D region"), included from CID 7472 VolumeEstimatedFromSingle2DRegion, @@ -397,7 +409,11 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements /// (121220,DCM,"Volume of circumscribed sphere"), included from CID 7472 VolumeOfCircumscribedSphere, /// (121219,DCM,"Volume of bounding three dimensional region"), included from CID 7472 - VolumeOfBoundingThreeDimensionalRegion + VolumeOfBoundingThreeDimensionalRegion, + /// (RNU0,IBSI,"Volume of Mesh"), included from CID 7472 + VolumeOfMesh, + /// (YEKZ,IBSI,"Volume from Voxel Summation"), included from CID 7472 + VolumeFromVoxelSummation }; /** (default) constructor diff --git a/dcmsr/include/dcmtk/dcmsr/codes/dcm.h b/dcmsr/include/dcmtk/dcmsr/codes/dcm.h index 85e1289e..21a284a3 100644 --- a/dcmsr/include/dcmtk/dcmsr/codes/dcm.h +++ b/dcmsr/include/dcmtk/dcmsr/codes/dcm.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file with DICOM Controlled Terminology Code Definitions (Coding Scheme "DCM", Version "01") * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:45:05 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 16:52:41 by J. Riesmeier * */ @@ -34,10 +34,10 @@ * code definitions * *--------------------*/ -// total number of codes: 3902 -// - retired: 144 +// total number of codes: 4218 +// - retired: 194 // - no name: 27 -// - not unique: 15 +// - not unique: 17 // The basic scheme for creating the names is as follows: // 'CODE_' + + ['_RETIRED'] + '_' + @@ -48,9 +48,10 @@ // The "cleaned camel-case version of the code meaning" is an attempt to map the free text // description of the code meaning to a compiler-friendly but still human-readable representation. -#define CODE_DCM_Archive DSRBasicCodedEntry("ARCHIVE", "DCM", "Archive") #define CODE_DCM_Autorefraction DSRBasicCodedEntry("AR", "DCM", "Autorefraction") +#define CODE_DCM_Archive DSRBasicCodedEntry("ARCHIVE", "DCM", "Archive") #define CODE_DCM_RETIRED_Angioscopy DSRBasicCodedEntry("AS", "DCM", "Angioscopy") +#define CODE_DCM_ContentAssessmentResult DSRBasicCodedEntry("ASMT", "DCM", "Content Assessment Result") #define CODE_DCM_Audio DSRBasicCodedEntry("AU", "DCM", "Audio") #define CODE_DCM_UltrasoundBoneDensitometry DSRBasicCodedEntry("BDUS", "DCM", "Ultrasound Bone Densitometry") #define CODE_DCM_BiomagneticImaging DSRBasicCodedEntry("BI", "DCM", "Biomagnetic imaging") @@ -64,10 +65,12 @@ #define CODE_DCM_ComputedRadiography DSRBasicCodedEntry("CR", "DCM", "Computed Radiography") #define CODE_DCM_RETIRED_Cystoscopy DSRBasicCodedEntry("CS", "DCM", "Cystoscopy") #define CODE_DCM_ComputedTomography DSRBasicCodedEntry("CT", "DCM", "Computed Tomography") +#define CODE_DCM_CTProtocol DSRBasicCodedEntry("CTPROTOCOL", "DCM", "CT Protocol") #define CODE_DCM_RETIRED_DuplexDoppler DSRBasicCodedEntry("DD", "DCM", "Duplex Doppler") #define CODE_DCM_RETIRED_DigitalFluoroscopy DSRBasicCodedEntry("DF", "DCM", "Digital fluoroscopy") #define CODE_DCM_Diaphanography DSRBasicCodedEntry("DG", "DCM", "Diaphanography") #define CODE_DCM_RETIRED_DigitalMicroscopy DSRBasicCodedEntry("DM", "DCM", "Digital microscopy") +#define CODE_DCM_Document_DOC DSRBasicCodedEntry("DOC", "DCM", "Document") #define CODE_DCM_DocumentDigitizerEquipment DSRBasicCodedEntry("DOCD", "DCM", "Document Digitizer Equipment") #define CODE_DCM_RETIRED_DigitalSubtractionAngiography DSRBasicCodedEntry("DS", "DCM", "Digital Subtraction Angiography") #define CODE_DCM_DepartmentSystemScheduler DSRBasicCodedEntry("DSS", "DCM", "Department System Scheduler") @@ -79,6 +82,7 @@ #define CODE_DCM_Female DSRBasicCodedEntry("F", "DCM", "Female") #define CODE_DCM_RETIRED_FluoresceinAngiography DSRBasicCodedEntry("FA", "DCM", "Fluorescein angiography") #define CODE_DCM_FemaleChangedToMale DSRBasicCodedEntry("FC", "DCM", "Female changed to Male") +#define CODE_DCM_SpatialFiducials_FID DSRBasicCodedEntry("FID", "DCM", "Spatial Fiducials") #define CODE_DCM_FilmDigitizer DSRBasicCodedEntry("FILMD", "DCM", "Film Digitizer") #define CODE_DCM_FemalePseudohermaphrodite DSRBasicCodedEntry("FP", "DCM", "Female Pseudohermaphrodite") #define CODE_DCM_RETIRED_Fundoscopy DSRBasicCodedEntry("FS", "DCM", "Fundoscopy") @@ -87,6 +91,7 @@ #define CODE_DCM_HardCopy DSRBasicCodedEntry("HC", "DCM", "Hard Copy") #define CODE_DCM_HemodynamicWaveform DSRBasicCodedEntry("HD", "DCM", "Hemodynamic Waveform") #define CODE_DCM_IntraOralRadiography DSRBasicCodedEntry("IO", "DCM", "Intra-oral Radiography") +#define CODE_DCM_IntraocularLensCalculation DSRBasicCodedEntry("IOL", "DCM", "Intraocular Lens Calculation") #define CODE_DCM_IntravascularOpticalCoherenceTomography DSRBasicCodedEntry("IVOCT", "DCM", "Intravascular Optical Coherence Tomography") #define CODE_DCM_IntravascularUltrasound DSRBasicCodedEntry("IVUS", "DCM", "Intravascular Ultrasound") #define CODE_DCM_Keratometry DSRBasicCodedEntry("KER", "DCM", "Keratometry") @@ -96,9 +101,9 @@ #define CODE_DCM_RETIRED_Laparoscopy DSRBasicCodedEntry("LP", "DCM", "Laparoscopy") #define CODE_DCM_LaserSurfaceScan DSRBasicCodedEntry("LS", "DCM", "Laser surface scan") #define CODE_DCM_Male DSRBasicCodedEntry("M", "DCM", "Male") +#define CODE_DCM_3DManufacturingModelingSystem DSRBasicCodedEntry("M3D", "DCM", "3D Manufacturing Modeling System") #define CODE_DCM_RETIRED_MagneticResonanceAngiography DSRBasicCodedEntry("MA", "DCM", "Magnetic resonance angiography") #define CODE_DCM_MaleChangedToFemale DSRBasicCodedEntry("MC", "DCM", "Male changed to Female") -#define CODE_DCM_3DManufacturingModelingSystem DSRBasicCodedEntry("M3D", "DCM", "3D Manufacturing Modeling System") #define CODE_DCM_MediaCreationDevice DSRBasicCodedEntry("MCD", "DCM", "Media Creation Device") #define CODE_DCM_PortableMediaImporterEquipment DSRBasicCodedEntry("MEDIM", "DCM", "Portable Media Importer Equipment") #define CODE_DCM_Mammography DSRBasicCodedEntry("MG", "DCM", "Mammography") @@ -120,11 +125,13 @@ #define CODE_DCM_OphthalmicVisualField DSRBasicCodedEntry("OPV", "DCM", "Ophthalmic Visual Field") #define CODE_DCM_OpticalSurfaceScanner DSRBasicCodedEntry("OSS", "DCM", "Optical Surface Scanner") #define CODE_DCM_OtherModality DSRBasicCodedEntry("OT", "DCM", "Other Modality") +#define CODE_DCM_Plan DSRBasicCodedEntry("PLAN", "DCM", "Plan") #define CODE_DCM_PresentationState DSRBasicCodedEntry("PR", "DCM", "Presentation State") #define CODE_DCM_HardCopyPrintServer DSRBasicCodedEntry("PRINT", "DCM", "Hard Copy Print Server") #define CODE_DCM_PositronEmissionTomography DSRBasicCodedEntry("PT", "DCM", "Positron emission tomography") #define CODE_DCM_PanoramicXRay DSRBasicCodedEntry("PX", "DCM", "Panoramic X-Ray") #define CODE_DCM_Registration DSRBasicCodedEntry("REG", "DCM", "Registration") +#define CODE_DCM_RespiratoryWaveform DSRBasicCodedEntry("RESP", "DCM", "Respiratory Waveform") #define CODE_DCM_Radiofluoroscopy DSRBasicCodedEntry("RF", "DCM", "Radiofluoroscopy") #define CODE_DCM_RadiographicImaging DSRBasicCodedEntry("RG", "DCM", "Radiographic imaging") #define CODE_DCM_RadiationTherapyDevice DSRBasicCodedEntry("RT", "DCM", "Radiation Therapy Device") @@ -133,12 +140,14 @@ #define CODE_DCM_RadiotherapyPlan DSRBasicCodedEntry("RTPLAN", "DCM", "Radiotherapy Plan") #define CODE_DCM_RadiotherapyTreatmentRecord DSRBasicCodedEntry("RTRECORD", "DCM", "Radiotherapy Treatment Record") #define CODE_DCM_RadiotherapyStructureSet DSRBasicCodedEntry("RTSTRUCT", "DCM", "Radiotherapy Structure Set") +#define CODE_DCM_RealWorldValueMap DSRBasicCodedEntry("RWV", "DCM", "Real World Value Map") #define CODE_DCM_Segmentation_SEG DSRBasicCodedEntry("SEG", "DCM", "Segmentation") #define CODE_DCM_SlideMicroscopy_SM DSRBasicCodedEntry("SM", "DCM", "Slide Microscopy") #define CODE_DCM_StereometricRelationship DSRBasicCodedEntry("SMR", "DCM", "Stereometric Relationship") #define CODE_DCM_StructuredReportDocument DSRBasicCodedEntry("SR", "DCM", "Structured Report Document") #define CODE_DCM_SubjectiveRefraction DSRBasicCodedEntry("SRF", "DCM", "Subjective Refraction") #define CODE_DCM_RETIRED_SinglePhotonEmissionComputedTomography DSRBasicCodedEntry("ST", "DCM", "Single-photon emission computed tomography") +#define CODE_DCM_AutomatedSlideStainer DSRBasicCodedEntry("STAIN", "DCM", "Automated Slide Stainer") #define CODE_DCM_Thermography DSRBasicCodedEntry("TG", "DCM", "Thermography") #define CODE_DCM_UnknownSex DSRBasicCodedEntry("U", "DCM", "Unknown Sex") #define CODE_DCM_Unavailable DSRBasicCodedEntry("UNAVAILABLE", "DCM", "Unavailable") @@ -1159,6 +1168,9 @@ #define CODE_DCM_ParallelGrid DSRBasicCodedEntry("111644", "DCM", "Parallel grid") #define CODE_DCM_CrossedGrid DSRBasicCodedEntry("111645", "DCM", "Crossed grid") #define CODE_DCM_NoGrid DSRBasicCodedEntry("111646", "DCM", "No grid") +#define CODE_DCM_CompressionForce DSRBasicCodedEntry("111647", "DCM", "Compression Force") +#define CODE_DCM_CompressionPressure DSRBasicCodedEntry("111648", "DCM", "Compression Pressure") +#define CODE_DCM_CompressionContactArea DSRBasicCodedEntry("111649", "DCM", "Compression Contact Area") #define CODE_DCM_SpectaclePrescriptionReport DSRBasicCodedEntry("111671", "DCM", "Spectacle Prescription Report") #define CODE_DCM_AddNear DSRBasicCodedEntry("111672", "DCM", "Add Near") #define CODE_DCM_AddIntermediate DSRBasicCodedEntry("111673", "DCM", "Add Intermediate") @@ -1169,6 +1181,7 @@ #define CODE_DCM_VerticalPrismBase DSRBasicCodedEntry("111678", "DCM", "Vertical Prism Base") #define CODE_DCM_DistancePupillaryDistance DSRBasicCodedEntry("111679", "DCM", "Distance Pupillary Distance") #define CODE_DCM_NearPupillaryDistance DSRBasicCodedEntry("111680", "DCM", "Near Pupillary Distance") +#define CODE_DCM_SMILE DSRBasicCodedEntry("111681", "DCM", "SMILE") #define CODE_DCM_AutorefractionVisualAcuity DSRBasicCodedEntry("111685", "DCM", "Autorefraction Visual Acuity") #define CODE_DCM_HabitualVisualAcuity DSRBasicCodedEntry("111686", "DCM", "Habitual Visual Acuity") #define CODE_DCM_PrescriptionVisualAcuity DSRBasicCodedEntry("111687", "DCM", "Prescription Visual Acuity") @@ -1221,6 +1234,9 @@ #define CODE_DCM_AutoKeratometry DSRBasicCodedEntry("111754", "DCM", "Auto Keratometry") #define CODE_DCM_SimulatedKeratometry DSRBasicCodedEntry("111755", "DCM", "Simulated Keratometry") #define CODE_DCM_EquivalentKReading DSRBasicCodedEntry("111756", "DCM", "Equivalent K-reading") +#define CODE_DCM_KeratometryMeasurementsSOPInstance DSRBasicCodedEntry("111757", "DCM", "Keratometry Measurements SOP Instance") +#define CODE_DCM_TotalCorneaPowerMeasurementMethod DSRBasicCodedEntry("111758", "DCM", "Total Cornea Power Measurement Method") +#define CODE_DCM_PosteriorCorneaSurfaceMeasurementMethod DSRBasicCodedEntry("111759", "DCM", "Posterior Cornea Surface Measurement Method") #define CODE_DCM_Haigis DSRBasicCodedEntry("111760", "DCM", "Haigis") #define CODE_DCM_HaigisL DSRBasicCodedEntry("111761", "DCM", "Haigis-L") #define CODE_DCM_Holladay1 DSRBasicCodedEntry("111762", "DCM", "Holladay 1") @@ -1243,6 +1259,7 @@ #define CODE_DCM_ExternalDataSource DSRBasicCodedEntry("111781", "DCM", "External Data Source") #define CODE_DCM_AxialMeasurementsSOPInstance DSRBasicCodedEntry("111782", "DCM", "Axial Measurements SOP Instance") #define CODE_DCM_RefractiveMeasurementsSOPInstance DSRBasicCodedEntry("111783", "DCM", "Refractive Measurements SOP Instance") +#define CODE_DCM_AutorefractionMeasurementsSOPInstance DSRBasicCodedEntry("111784", "DCM", "Autorefraction Measurements SOP Instance") #define CODE_DCM_StandardDeviationOfMeasurementsUsed DSRBasicCodedEntry("111786", "DCM", "Standard Deviation of measurements used") #define CODE_DCM_SignalToNoiseRatio DSRBasicCodedEntry("111787", "DCM", "Signal to Noise Ratio") #define CODE_DCM_SphericalProjection DSRBasicCodedEntry("111791", "DCM", "Spherical projection") @@ -1304,6 +1321,14 @@ #define CODE_DCM_VisualFieldLossDueToLocalDefect DSRBasicCodedEntry("111854", "DCM", "Visual Field Loss Due to Local Defect") #define CODE_DCM_GlaucomaHemifieldTestAnalysis DSRBasicCodedEntry("111855", "DCM", "Glaucoma Hemifield Test Analysis") #define CODE_DCM_OpticalFixationMeasurements DSRBasicCodedEntry("111856", "DCM", "Optical Fixation Measurements") +#define CODE_DCM_HaigisToric DSRBasicCodedEntry("111860", "DCM", "Haigis Toric") +#define CODE_DCM_HaigisLToric DSRBasicCodedEntry("111861", "DCM", "Haigis-L Toric") +#define CODE_DCM_BarrettToric DSRBasicCodedEntry("111862", "DCM", "Barrett Toric") +#define CODE_DCM_BarrettTrueK DSRBasicCodedEntry("111863", "DCM", "Barrett True-K") +#define CODE_DCM_BarrettTrueKToric DSRBasicCodedEntry("111864", "DCM", "Barrett True-K Toric") +#define CODE_DCM_BarrettUniversalII DSRBasicCodedEntry("111865", "DCM", "Barrett Universal II") +#define CODE_DCM_BarrettLensFactor DSRBasicCodedEntry("111866", "DCM", "Barrett Lens Factor") +#define CODE_DCM_BarrettDesignFactor DSRBasicCodedEntry("111867", "DCM", "Barrett Design Factor") #define CODE_DCM_MaculaCentered DSRBasicCodedEntry("111900", "DCM", "Macula centered") #define CODE_DCM_DiscCentered DSRBasicCodedEntry("111901", "DCM", "Disc centered") #define CODE_DCM_LesionCentered DSRBasicCodedEntry("111902", "DCM", "Lesion centered") @@ -1494,7 +1519,7 @@ #define CODE_DCM_WellDemarcated DSRBasicCodedEntry("112139", "DCM", "Well demarcated") #define CODE_DCM_SharplyDemarcated DSRBasicCodedEntry("112140", "DCM", "Sharply demarcated") #define CODE_DCM_PoorlyDemarcated DSRBasicCodedEntry("112141", "DCM", "Poorly demarcated") -#define CODE_DCM_Circumscribed DSRBasicCodedEntry("112142", "DCM", "Circumscribed") +#define CODE_DCM_RETIRED_Circumscribed DSRBasicCodedEntry("112142", "DCM", "Circumscribed") #define CODE_DCM_Air DSRBasicCodedEntry("112143", "DCM", "Air") #define CODE_DCM_SoftTissue DSRBasicCodedEntry("112144", "DCM", "Soft tissue") #define CODE_DCM_Calcium DSRBasicCodedEntry("112145", "DCM", "Calcium") @@ -1705,8 +1730,8 @@ #define CODE_DCM_MeanTransitTime DSRBasicCodedEntry("113052", "DCM", "Mean Transit Time") #define CODE_DCM_PixelByPixelMultiplication DSRBasicCodedEntry("113053", "DCM", "Pixel by pixel multiplication") #define CODE_DCM_NegativeEnhancementIntegral DSRBasicCodedEntry("113054", "DCM", "Negative Enhancement Integral") -#define CODE_DCM_RegionalCerebralBloodFlow DSRBasicCodedEntry("113055", "DCM", "Regional Cerebral Blood Flow") -#define CODE_DCM_RegionalCerebralBloodVolume DSRBasicCodedEntry("113056", "DCM", "Regional Cerebral Blood Volume") +#define CODE_DCM_RETIRED_RegionalCerebralBloodFlow DSRBasicCodedEntry("113055", "DCM", "Regional Cerebral Blood Flow") +#define CODE_DCM_RETIRED_RegionalCerebralBloodVolume DSRBasicCodedEntry("113056", "DCM", "Regional Cerebral Blood Volume") #define CODE_DCM_RCoefficient DSRBasicCodedEntry("113057", "DCM", "R-Coefficient") #define CODE_DCM_ProtonDensity DSRBasicCodedEntry("113058", "DCM", "Proton Density") #define CODE_DCM_SignalChange DSRBasicCodedEntry("113059", "DCM", "Signal Change") @@ -1965,7 +1990,7 @@ #define CODE_DCM_FocalSpotSize DSRBasicCodedEntry("113766", "DCM", "Focal Spot Size") #define CODE_DCM_AverageXRayTubeCurrent DSRBasicCodedEntry("113767", "DCM", "Average X-Ray Tube Current") #define CODE_DCM_NumberOfPulses DSRBasicCodedEntry("113768", "DCM", "Number of Pulses") -#define CODE_DCM_IrradiationEventUID_113769 DSRBasicCodedEntry("113769", "DCM", "Irradiation Event UID") +#define CODE_DCM_IrradiationEventUID DSRBasicCodedEntry("113769", "DCM", "Irradiation Event UID") #define CODE_DCM_ColumnAngulation DSRBasicCodedEntry("113770", "DCM", "Column Angulation") #define CODE_DCM_XRayFilters DSRBasicCodedEntry("113771", "DCM", "X-Ray Filters") #define CODE_DCM_XRayFilterType DSRBasicCodedEntry("113772", "DCM", "X-Ray Filter Type") @@ -2028,7 +2053,7 @@ #define CODE_DCM_IrradiationAuthorizing DSRBasicCodedEntry("113850", "DCM", "Irradiation Authorizing") #define CODE_DCM_IrradiationAdministering DSRBasicCodedEntry("113851", "DCM", "Irradiation Administering") #define CODE_DCM_IrradiationEvent DSRBasicCodedEntry("113852", "DCM", "Irradiation Event") -#define CODE_DCM_IrradiationEventUID_113853 DSRBasicCodedEntry("113853", "DCM", "Irradiation Event UID") +#define CODE_DCM_RETIRED_IrradiationEventUID DSRBasicCodedEntry("113853", "DCM", "Irradiation Event UID") #define CODE_DCM_SourceOfDoseInformation DSRBasicCodedEntry("113854", "DCM", "Source of Dose Information") #define CODE_DCM_TotalAcquisitionTime DSRBasicCodedEntry("113855", "DCM", "Total Acquisition Time") #define CODE_DCM_AutomatedDataCollection DSRBasicCodedEntry("113856", "DCM", "Automated Data Collection") @@ -2149,7 +2174,7 @@ #define CODE_DCM_Checkerboard DSRBasicCodedEntry("114216", "DCM", "Checkerboard") #define CODE_DCM_QuotationMode DSRBasicCodedEntry("121001", "DCM", "Quotation Mode") #define CODE_DCM_QuotedSource DSRBasicCodedEntry("121002", "DCM", "Quoted Source") -#define CODE_DCM_Document DSRBasicCodedEntry("121003", "DCM", "Document") +#define CODE_DCM_Document_121003 DSRBasicCodedEntry("121003", "DCM", "Document") #define CODE_DCM_Verbal DSRBasicCodedEntry("121004", "DCM", "Verbal") #define CODE_DCM_ObserverType DSRBasicCodedEntry("121005", "DCM", "Observer Type") #define CODE_DCM_Person DSRBasicCodedEntry("121006", "DCM", "Person") @@ -3215,7 +3240,7 @@ #define CODE_DCM_FractalDimension DSRBasicCodedEntry("126050", "DCM", "Fractal Dimension") #define CODE_DCM_Skewness DSRBasicCodedEntry("126051", "DCM", "Skewness") #define CODE_DCM_Kurtosis DSRBasicCodedEntry("126052", "DCM", "Kurtosis") -#define CODE_DCM_JointEntropyOfGLCM DSRBasicCodedEntry("126060", "DCM", "Joint Entropy of GLCM") +#define CODE_DCM_RETIRED_JointEntropyOfGLCM DSRBasicCodedEntry("126060", "DCM", "Joint Entropy of GLCM") #define CODE_DCM_RootAngularSecondMomentOfGLCM DSRBasicCodedEntry("126061", "DCM", "Root Angular Second Moment of GLCM") #define CODE_DCM_InverseDifferenceMomentOfGLCM DSRBasicCodedEntry("126062", "DCM", "Inverse Difference Moment of GLCM") #define CODE_DCM_ContrastOfGLCM DSRBasicCodedEntry("126063", "DCM", "Contrast of GLCM") @@ -3286,13 +3311,15 @@ #define CODE_DCM_MaximumDifference DSRBasicCodedEntry("126376", "DCM", "Maximum Difference") #define CODE_DCM_TracerConcentration DSRBasicCodedEntry("126377", "DCM", "Tracer Concentration") #define CODE_DCM_ContrastLongitudinalRelaxivity DSRBasicCodedEntry("126380", "DCM", "Contrast Longitudinal Relaxivity") -#define CODE_DCM_RegionalBloodFlow DSRBasicCodedEntry("126390", "DCM", "Regional Blood Flow") -#define CODE_DCM_RegionalBloodVolume DSRBasicCodedEntry("126391", "DCM", "Regional Blood Volume") +#define CODE_DCM_AbsoluteRegionalBloodFlow DSRBasicCodedEntry("126390", "DCM", "Absolute Regional Blood Flow") +#define CODE_DCM_AbsoluteRegionalBloodVolume DSRBasicCodedEntry("126391", "DCM", "Absolute Regional Blood Volume") #define CODE_DCM_OxygenExtractionFraction DSRBasicCodedEntry("126392", "DCM", "Oxygen Extraction Fraction") #define CODE_DCM_R1 DSRBasicCodedEntry("126393", "DCM", "R1") #define CODE_DCM_R2 DSRBasicCodedEntry("126394", "DCM", "R2") #define CODE_DCM_R2Star DSRBasicCodedEntry("126395", "DCM", "R2*") #define CODE_DCM_MagneticSusceptibility DSRBasicCodedEntry("126396", "DCM", "Magnetic Susceptibility") +#define CODE_DCM_RelativeRegionalBloodFlow DSRBasicCodedEntry("126397", "DCM", "Relative Regional Blood Flow") +#define CODE_DCM_RelativeRegionalBloodVolume DSRBasicCodedEntry("126398", "DCM", "Relative Regional Blood Volume") #define CODE_DCM_StandardizedUptakeValue DSRBasicCodedEntry("126400", "DCM", "Standardized Uptake Value") #define CODE_DCM_SUVbw DSRBasicCodedEntry("126401", "DCM", "SUVbw") #define CODE_DCM_SUVlbm DSRBasicCodedEntry("126402", "DCM", "SUVlbm") @@ -3346,8 +3373,10 @@ #define CODE_DCM_Nifene_F18 DSRBasicCodedEntry("126714", "DCM", "Nifene F^18^") #define CODE_DCM_CLR1404_I124 DSRBasicCodedEntry("126715", "DCM", "CLR1404 I^124^") #define CODE_DCM_CLR1404_I131 DSRBasicCodedEntry("126716", "DCM", "CLR1404 I^131^") -#define CODE_DCM_THK5351_F18 DSRBasicCodedEntry("126717", "DCM", "THK5351 F^18^") +#define CODE_DCM_RETIRED_THK5351_F18 DSRBasicCodedEntry("126717", "DCM", "THK5351 F^18^") #define CODE_DCM_Flurpiridaz_F18 DSRBasicCodedEntry("126718", "DCM", "Flurpiridaz F^18^") +#define CODE_DCM_RO6924963_11C DSRBasicCodedEntry("126719", "DCM", "RO6924963 ^11^C") +#define CODE_DCM_RO6931643_11C DSRBasicCodedEntry("126720", "DCM", "RO6931643 ^11^C") #define CODE_DCM_Obinituzimab_89Zr DSRBasicCodedEntry("126721", "DCM", "Obinituzimab ^89^Zr") #define CODE_DCM_Benralizumab_89Zr DSRBasicCodedEntry("126722", "DCM", "Benralizumab ^89^Zr") #define CODE_DCM_Ocaratuzumab_89Zr DSRBasicCodedEntry("126723", "DCM", "Ocaratuzumab ^89^Zr") @@ -3381,6 +3410,9 @@ #define CODE_DCM_AntiB220_89Zr DSRBasicCodedEntry("126754", "DCM", "Anti-B220 ^89^Zr") #define CODE_DCM_RO5323441_89Zr DSRBasicCodedEntry("126755", "DCM", "RO5323441 ^89^Zr") #define CODE_DCM_RO542908_89Zr DSRBasicCodedEntry("126756", "DCM", "RO542908 ^89^Zr") +#define CODE_DCM_RO6958948_18F DSRBasicCodedEntry("126757", "DCM", "RO6958948 ^18^F") +#define CODE_DCM_PSMA1007_F18 DSRBasicCodedEntry("126758", "DCM", "PSMA-1007 F^18^") +#define CODE_DCM_PSMA617_Ga68 DSRBasicCodedEntry("126759", "DCM", "PSMA-617 Ga^68^") #define CODE_DCM_DfFK_89Zr DSRBasicCodedEntry("126760", "DCM", "Df-FK ^89^Zr") #define CODE_DCM_DfFKPEG3_89Zr DSRBasicCodedEntry("126761", "DCM", "Df-FK-PEG(3) ^89^Zr") #define CODE_DCM_DfFK2_89Zr DSRBasicCodedEntry("126762", "DCM", "Df-[FK](2) ^89^Zr") @@ -3670,6 +3702,8 @@ #define CODE_DCM_SurfaceOfTheChoroidScleraInterface DSRBasicCodedEntry("128301", "DCM", "Surface of the choroid-sclera interface") #define CODE_DCM_OuterSurfaceOfTheCC DSRBasicCodedEntry("128302", "DCM", "Outer surface of the CC") #define CODE_DCM_OCTBScanAnalysis DSRBasicCodedEntry("128303", "DCM", "OCT B-scan analysis") +#define CODE_DCM_OCTAOneSidedRatio_lesser DSRBasicCodedEntry("128304", "DCM", "OCT-A one-sided ratio (lesser)") +#define CODE_DCM_OCTAOneSidedRatio_greater DSRBasicCodedEntry("128305", "DCM", "OCT-A one-sided ratio (greater)") #define CODE_DCM_PatientRadiationDoseReport DSRBasicCodedEntry("128401", "DCM", "Patient Radiation Dose Report") #define CODE_DCM_RadiationDoseEstimate DSRBasicCodedEntry("128402", "DCM", "Radiation Dose Estimate") #define CODE_DCM_RadiationDoseEstimateName DSRBasicCodedEntry("128403", "DCM", "Radiation Dose Estimate Name") @@ -3710,7 +3744,7 @@ #define CODE_DCM_ModelMaximumHeight DSRBasicCodedEntry("128442", "DCM", "Model Maximum Height") #define CODE_DCM_SpatialRegistrationReference DSRBasicCodedEntry("128444", "DCM", "Spatial Registration Reference") #define CODE_DCM_RegistrationMethod DSRBasicCodedEntry("128446", "DCM", "Registration Method") -#define CODE_DCM_SpatialFiducials DSRBasicCodedEntry("128447", "DCM", "Spatial Fiducials") +#define CODE_DCM_SpatialFiducials_128447 DSRBasicCodedEntry("128447", "DCM", "Spatial Fiducials") #define CODE_DCM_CorrectionFactor DSRBasicCodedEntry("128452", "DCM", "Correction Factor") #define CODE_DCM_CurveFitParameter DSRBasicCodedEntry("128453", "DCM", "Curve Fit Parameter") #define CODE_DCM_HomogeneityFactor DSRBasicCodedEntry("128455", "DCM", "Homogeneity Factor") @@ -3863,57 +3897,60 @@ #define CODE_DCM_IdentifierWithinPersonObserverRole DSRBasicCodedEntry("128775", "DCM", "Identifier within Person Observer's Role") #define CODE_DCM_GrayLevelRunLengthMatrix DSRBasicCodedEntry("128776", "DCM", "Gray Level Run Length Matrix") #define CODE_DCM_GrayLevelSizeZoneMatrix DSRBasicCodedEntry("128777", "DCM", "Gray Level Size Zone Matrix") -#define CODE_DCM_JointMaximumOfGLCM DSRBasicCodedEntry("128781", "DCM", "Joint Maximum of GLCM") -#define CODE_DCM_JointAverageOfGLCM DSRBasicCodedEntry("128782", "DCM", "Joint Average of GLCM") -#define CODE_DCM_JointVarianceOfGLCM DSRBasicCodedEntry("128783", "DCM", "Joint Variance of GLCM") -#define CODE_DCM_DifferenceAverageOfGLCM DSRBasicCodedEntry("128784", "DCM", "Difference Average of GLCM") -#define CODE_DCM_DifferenceVarianceOfGLCM DSRBasicCodedEntry("128785", "DCM", "Difference Variance of GLCM") -#define CODE_DCM_DifferenceEntropyOfGLCM DSRBasicCodedEntry("128786", "DCM", "Difference Entropy of GLCM") -#define CODE_DCM_SumAverageOfGLCM DSRBasicCodedEntry("128787", "DCM", "Sum Average of GLCM") -#define CODE_DCM_SumVarianceOfGLCM DSRBasicCodedEntry("128788", "DCM", "Sum Variance of GLCM") -#define CODE_DCM_SumEntropyOfGLCM DSRBasicCodedEntry("128789", "DCM", "Sum Entropy of GLCM") +#define CODE_DCM_GrayLevelDistanceZoneMatrix DSRBasicCodedEntry("128778", "DCM", "Gray Level Distance Zone Matrix") +#define CODE_DCM_NeighbourhoodGreyToneDifferenceMatrix DSRBasicCodedEntry("128779", "DCM", "Neighbourhood Grey Tone Difference Matrix") +#define CODE_DCM_NeighbouringGreyLevelDependenceMatrix DSRBasicCodedEntry("128780", "DCM", "Neighbouring Grey Level Dependence Matrix") +#define CODE_DCM_RETIRED_JointMaximumOfGLCM DSRBasicCodedEntry("128781", "DCM", "Joint Maximum of GLCM") +#define CODE_DCM_RETIRED_JointAverageOfGLCM DSRBasicCodedEntry("128782", "DCM", "Joint Average of GLCM") +#define CODE_DCM_RETIRED_JointVarianceOfGLCM DSRBasicCodedEntry("128783", "DCM", "Joint Variance of GLCM") +#define CODE_DCM_RETIRED_DifferenceAverageOfGLCM DSRBasicCodedEntry("128784", "DCM", "Difference Average of GLCM") +#define CODE_DCM_RETIRED_DifferenceVarianceOfGLCM DSRBasicCodedEntry("128785", "DCM", "Difference Variance of GLCM") +#define CODE_DCM_RETIRED_DifferenceEntropyOfGLCM DSRBasicCodedEntry("128786", "DCM", "Difference Entropy of GLCM") +#define CODE_DCM_RETIRED_SumAverageOfGLCM DSRBasicCodedEntry("128787", "DCM", "Sum Average of GLCM") +#define CODE_DCM_RETIRED_SumVarianceOfGLCM DSRBasicCodedEntry("128788", "DCM", "Sum Variance of GLCM") +#define CODE_DCM_RETIRED_SumEntropyOfGLCM DSRBasicCodedEntry("128789", "DCM", "Sum Entropy of GLCM") #define CODE_DCM_InverseDifferenceOfGLCM DSRBasicCodedEntry("128790", "DCM", "Inverse Difference of GLCM") #define CODE_DCM_InverseDifferenceNormalizedOfGLCM DSRBasicCodedEntry("128791", "DCM", "Inverse Difference Normalized of GLCM") #define CODE_DCM_InverseDifferenceMomentNormalizedOfGLCM DSRBasicCodedEntry("128792", "DCM", "Inverse Difference Moment Normalized of GLCM") -#define CODE_DCM_InverseVarianceOfGLCM DSRBasicCodedEntry("128793", "DCM", "Inverse Variance of GLCM") -#define CODE_DCM_AutocorrelationOfGLCM DSRBasicCodedEntry("128794", "DCM", "Autocorrelation of GLCM") -#define CODE_DCM_ClusterTendencyOfGLCM DSRBasicCodedEntry("128795", "DCM", "Cluster Tendency of GLCM") -#define CODE_DCM_ClusterShadeOfGLCM DSRBasicCodedEntry("128796", "DCM", "Cluster Shade of GLCM") -#define CODE_DCM_ClusterProminenceOfGLCM DSRBasicCodedEntry("128797", "DCM", "Cluster Prominence of GLCM") -#define CODE_DCM_FirstMeasureOfInformationCorrelationOfGLCM DSRBasicCodedEntry("128798", "DCM", "First Measure of Information Correlation of GLCM") -#define CODE_DCM_SecondMeasureOfInformationCorrelationOfGLCM DSRBasicCodedEntry("128799", "DCM", "Second Measure of Information Correlation of GLCM") -#define CODE_DCM_ShortRunsEmphasis DSRBasicCodedEntry("128801", "DCM", "Short Runs Emphasis") -#define CODE_DCM_LongRunsEmphasis DSRBasicCodedEntry("128802", "DCM", "Long Runs Emphasis") -#define CODE_DCM_LowGrayLevelRunEmphasis DSRBasicCodedEntry("128803", "DCM", "Low Gray Level Run Emphasis") -#define CODE_DCM_HighGrayLevelRunEmphasis DSRBasicCodedEntry("128804", "DCM", "High Gray Level Run Emphasis") -#define CODE_DCM_ShortRunLowGrayLevelEmphasis DSRBasicCodedEntry("128805", "DCM", "Short Run Low Gray Level Emphasis") -#define CODE_DCM_ShortRunHighGrayLevelEmphasis DSRBasicCodedEntry("128806", "DCM", "Short Run High Gray Level Emphasis") -#define CODE_DCM_LongRunLowGrayLevelEmphasis DSRBasicCodedEntry("128807", "DCM", "Long Run Low Gray Level Emphasis") -#define CODE_DCM_LongRunHighGrayLevelEmphasis DSRBasicCodedEntry("128808", "DCM", "Long Run High Gray Level Emphasis") -#define CODE_DCM_GrayLevelNonuniformityInRuns DSRBasicCodedEntry("128809", "DCM", "Gray Level Nonuniformity in Runs") +#define CODE_DCM_RETIRED_InverseVarianceOfGLCM DSRBasicCodedEntry("128793", "DCM", "Inverse Variance of GLCM") +#define CODE_DCM_RETIRED_AutocorrelationOfGLCM DSRBasicCodedEntry("128794", "DCM", "Autocorrelation of GLCM") +#define CODE_DCM_RETIRED_ClusterTendencyOfGLCM DSRBasicCodedEntry("128795", "DCM", "Cluster Tendency of GLCM") +#define CODE_DCM_RETIRED_ClusterShadeOfGLCM DSRBasicCodedEntry("128796", "DCM", "Cluster Shade of GLCM") +#define CODE_DCM_RETIRED_ClusterProminenceOfGLCM DSRBasicCodedEntry("128797", "DCM", "Cluster Prominence of GLCM") +#define CODE_DCM_RETIRED_FirstMeasureOfInformationCorrelationOfGLCM DSRBasicCodedEntry("128798", "DCM", "First Measure of Information Correlation of GLCM") +#define CODE_DCM_RETIRED_SecondMeasureOfInformationCorrelationOfGLCM DSRBasicCodedEntry("128799", "DCM", "Second Measure of Information Correlation of GLCM") +#define CODE_DCM_RETIRED_ShortRunsEmphasis DSRBasicCodedEntry("128801", "DCM", "Short Runs Emphasis") +#define CODE_DCM_RETIRED_LongRunsEmphasis DSRBasicCodedEntry("128802", "DCM", "Long Runs Emphasis") +#define CODE_DCM_RETIRED_LowGrayLevelRunEmphasis DSRBasicCodedEntry("128803", "DCM", "Low Gray Level Run Emphasis") +#define CODE_DCM_RETIRED_HighGrayLevelRunEmphasis DSRBasicCodedEntry("128804", "DCM", "High Gray Level Run Emphasis") +#define CODE_DCM_RETIRED_ShortRunLowGrayLevelEmphasis DSRBasicCodedEntry("128805", "DCM", "Short Run Low Gray Level Emphasis") +#define CODE_DCM_RETIRED_ShortRunHighGrayLevelEmphasis DSRBasicCodedEntry("128806", "DCM", "Short Run High Gray Level Emphasis") +#define CODE_DCM_RETIRED_LongRunLowGrayLevelEmphasis DSRBasicCodedEntry("128807", "DCM", "Long Run Low Gray Level Emphasis") +#define CODE_DCM_RETIRED_LongRunHighGrayLevelEmphasis DSRBasicCodedEntry("128808", "DCM", "Long Run High Gray Level Emphasis") +#define CODE_DCM_RETIRED_GrayLevelNonuniformityInRuns DSRBasicCodedEntry("128809", "DCM", "Gray Level Nonuniformity in Runs") #define CODE_DCM_GrayLevelNonuniformityInRunsNormalized DSRBasicCodedEntry("128810", "DCM", "Gray Level Nonuniformity in Runs Normalized") -#define CODE_DCM_RunLengthNonuniformity DSRBasicCodedEntry("128811", "DCM", "Run Length Nonuniformity") +#define CODE_DCM_RETIRED_RunLengthNonuniformity DSRBasicCodedEntry("128811", "DCM", "Run Length Nonuniformity") #define CODE_DCM_RunLengthNonuniformityNormalized DSRBasicCodedEntry("128812", "DCM", "Run Length Nonuniformity Normalized") -#define CODE_DCM_RunPercentage DSRBasicCodedEntry("128813", "DCM", "Run Percentage") -#define CODE_DCM_GrayLevelVarianceInRuns DSRBasicCodedEntry("128814", "DCM", "Gray Level Variance in Runs") -#define CODE_DCM_RunLengthVariance DSRBasicCodedEntry("128815", "DCM", "Run Length Variance") -#define CODE_DCM_RunEntropy DSRBasicCodedEntry("128816", "DCM", "Run Entropy") -#define CODE_DCM_SmallZoneEmphasis DSRBasicCodedEntry("128821", "DCM", "Small Zone Emphasis") -#define CODE_DCM_LargeZoneEmphasis DSRBasicCodedEntry("128822", "DCM", "Large Zone Emphasis") -#define CODE_DCM_LowGrayLevelZoneEmphasis DSRBasicCodedEntry("128823", "DCM", "Low Gray Level Zone Emphasis") -#define CODE_DCM_HighGrayLevelZoneEmphasis DSRBasicCodedEntry("128824", "DCM", "High Gray Level Zone Emphasis") -#define CODE_DCM_SmallZoneLowGrayLevelEmphasis DSRBasicCodedEntry("128825", "DCM", "Small Zone Low Gray Level Emphasis") -#define CODE_DCM_SmallZoneHighGrayLevelEmphasis DSRBasicCodedEntry("128826", "DCM", "Small Zone High Gray Level Emphasis") -#define CODE_DCM_LargeZoneLowGrayLevelEmphasis DSRBasicCodedEntry("128827", "DCM", "Large Zone Low Gray Level Emphasis") -#define CODE_DCM_LargeZoneHighGrayLevelEmphasis DSRBasicCodedEntry("128828", "DCM", "Large Zone High Gray Level Emphasis") -#define CODE_DCM_GrayLevelNonuniformityOfZoneCounts DSRBasicCodedEntry("128829", "DCM", "Gray Level Nonuniformity of Zone Counts") +#define CODE_DCM_RETIRED_RunPercentage DSRBasicCodedEntry("128813", "DCM", "Run Percentage") +#define CODE_DCM_RETIRED_GrayLevelVarianceInRuns DSRBasicCodedEntry("128814", "DCM", "Gray Level Variance in Runs") +#define CODE_DCM_RETIRED_RunLengthVariance DSRBasicCodedEntry("128815", "DCM", "Run Length Variance") +#define CODE_DCM_RETIRED_RunEntropy DSRBasicCodedEntry("128816", "DCM", "Run Entropy") +#define CODE_DCM_RETIRED_SmallZoneEmphasis DSRBasicCodedEntry("128821", "DCM", "Small Zone Emphasis") +#define CODE_DCM_RETIRED_LargeZoneEmphasis DSRBasicCodedEntry("128822", "DCM", "Large Zone Emphasis") +#define CODE_DCM_RETIRED_LowGrayLevelZoneEmphasis DSRBasicCodedEntry("128823", "DCM", "Low Gray Level Zone Emphasis") +#define CODE_DCM_RETIRED_HighGrayLevelZoneEmphasis DSRBasicCodedEntry("128824", "DCM", "High Gray Level Zone Emphasis") +#define CODE_DCM_RETIRED_SmallZoneLowGrayLevelEmphasis DSRBasicCodedEntry("128825", "DCM", "Small Zone Low Gray Level Emphasis") +#define CODE_DCM_RETIRED_SmallZoneHighGrayLevelEmphasis DSRBasicCodedEntry("128826", "DCM", "Small Zone High Gray Level Emphasis") +#define CODE_DCM_RETIRED_LargeZoneLowGrayLevelEmphasis DSRBasicCodedEntry("128827", "DCM", "Large Zone Low Gray Level Emphasis") +#define CODE_DCM_RETIRED_LargeZoneHighGrayLevelEmphasis DSRBasicCodedEntry("128828", "DCM", "Large Zone High Gray Level Emphasis") +#define CODE_DCM_RETIRED_GrayLevelNonuniformityOfZoneCounts DSRBasicCodedEntry("128829", "DCM", "Gray Level Nonuniformity of Zone Counts") #define CODE_DCM_GrayLevelNonuniformityOfZoneCountsNormalized DSRBasicCodedEntry("128830", "DCM", "Gray Level Nonuniformity of Zone Counts Normalized") -#define CODE_DCM_ZoneSizeNonuniformity DSRBasicCodedEntry("128831", "DCM", "Zone Size Nonuniformity") +#define CODE_DCM_RETIRED_ZoneSizeNonuniformity DSRBasicCodedEntry("128831", "DCM", "Zone Size Nonuniformity") #define CODE_DCM_ZoneSizeNonuniformityNormalized DSRBasicCodedEntry("128832", "DCM", "Zone Size Nonuniformity Normalized") -#define CODE_DCM_ZonePercentage DSRBasicCodedEntry("128833", "DCM", "Zone Percentage") -#define CODE_DCM_GrayLevelVarianceInZones DSRBasicCodedEntry("128834", "DCM", "Gray Level Variance in Zones") -#define CODE_DCM_ZoneSizeVariance DSRBasicCodedEntry("128835", "DCM", "Zone Size Variance") -#define CODE_DCM_ZoneSizeEntropy DSRBasicCodedEntry("128836", "DCM", "Zone Size Entropy") +#define CODE_DCM_RETIRED_ZonePercentage DSRBasicCodedEntry("128833", "DCM", "Zone Percentage") +#define CODE_DCM_RETIRED_GrayLevelVarianceInZones DSRBasicCodedEntry("128834", "DCM", "Gray Level Variance in Zones") +#define CODE_DCM_RETIRED_ZoneSizeVariance DSRBasicCodedEntry("128835", "DCM", "Zone Size Variance") +#define CODE_DCM_RETIRED_ZoneSizeEntropy DSRBasicCodedEntry("128836", "DCM", "Zone Size Entropy") #define CODE_DCM_EligibilityReader DSRBasicCodedEntry("129001", "DCM", "Eligibility Reader") #define CODE_DCM_Designator DSRBasicCodedEntry("129002", "DCM", "Designator") #define CODE_DCM_ImageQualityController DSRBasicCodedEntry("129003", "DCM", "Image Quality Controller") @@ -3950,5 +3987,284 @@ #define CODE_DCM_MRMarker DSRBasicCodedEntry("129308", "DCM", "MR Marker") #define CODE_DCM_InfraredReflectorMarker DSRBasicCodedEntry("129309", "DCM", "Infrared Reflector Marker") #define CODE_DCM_VisibleReflectorMarker DSRBasicCodedEntry("129310", "DCM", "Visible Reflector Marker") +#define CODE_DCM_EffectiveAtomicNumber DSRBasicCodedEntry("129320", "DCM", "Effective Atomic Number") +#define CODE_DCM_ModifiedHounsfieldUnit DSRBasicCodedEntry("129321", "DCM", "Modified Hounsfield Unit") +#define CODE_DCM_ValueBasedImage DSRBasicCodedEntry("129322", "DCM", "Value-based Image") +#define CODE_DCM_MaterialSpecificImage DSRBasicCodedEntry("129323", "DCM", "Material Specific Image") +#define CODE_DCM_MaterialRemovedImage DSRBasicCodedEntry("129324", "DCM", "Material Removed Image") +#define CODE_DCM_MaterialHighlightedImage DSRBasicCodedEntry("129325", "DCM", "Material Highlighted Image") +#define CODE_DCM_MaterialSuppressedImage DSRBasicCodedEntry("129326", "DCM", "Material Suppressed Image") +#define CODE_DCM_MaterialRecalculatedImage DSRBasicCodedEntry("129327", "DCM", "Material Recalculated Image") +#define CODE_DCM_VolumeOccupancyImage DSRBasicCodedEntry("129328", "DCM", "Volume Occupancy Image") +#define CODE_DCM_MassOccupancyImage DSRBasicCodedEntry("129329", "DCM", "Mass Occupancy Image") +#define CODE_DCM_MinimumSurfaceRadiationDose DSRBasicCodedEntry("130001", "DCM", "Minimum Surface Radiation Dose") +#define CODE_DCM_MaximumSurfaceRadiationDose DSRBasicCodedEntry("130002", "DCM", "Maximum Surface Radiation Dose") +#define CODE_DCM_MinimumRadiationDose DSRBasicCodedEntry("130003", "DCM", "Minimum Radiation Dose") +#define CODE_DCM_MaximumRadiationDose DSRBasicCodedEntry("130004", "DCM", "Maximum Radiation Dose") +#define CODE_DCM_MinimumMeanRadiationDose DSRBasicCodedEntry("130005", "DCM", "Minimum Mean Radiation Dose") +#define CODE_DCM_MaximumMeanRadiationDose DSRBasicCodedEntry("130006", "DCM", "Maximum Mean Radiation Dose") +#define CODE_DCM_MinimumEquivalentUniformDose DSRBasicCodedEntry("130007", "DCM", "Minimum Equivalent Uniform Dose") +#define CODE_DCM_MaximumEquivalentUniformDose DSRBasicCodedEntry("130008", "DCM", "Maximum Equivalent Uniform Dose") +#define CODE_DCM_PrescriptionRadiationDose DSRBasicCodedEntry("130009", "DCM", "Prescription Radiation Dose") +#define CODE_DCM_MinimumConformityIndex DSRBasicCodedEntry("130010", "DCM", "Minimum Conformity Index") +#define CODE_DCM_MinimumHealthyTissueConformityIndex DSRBasicCodedEntry("130011", "DCM", "Minimum Healthy Tissue Conformity Index") +#define CODE_DCM_MinimumConformationNumber DSRBasicCodedEntry("130012", "DCM", "Minimum Conformation Number") +#define CODE_DCM_MaximumHomogeneityIndex DSRBasicCodedEntry("130013", "DCM", "Maximum Homogeneity Index") +#define CODE_DCM_MinimumPercentVolumeAtRadiationDose DSRBasicCodedEntry("130014", "DCM", "Minimum Percent Volume at Radiation Dose") +#define CODE_DCM_MaximumPercentVolumeAtRadiationDose DSRBasicCodedEntry("130015", "DCM", "Maximum Percent Volume at Radiation Dose") +#define CODE_DCM_MinimumAbsoluteVolumeAtRadiationDose DSRBasicCodedEntry("130016", "DCM", "Minimum Absolute Volume at Radiation Dose") +#define CODE_DCM_MaximumAbsoluteVolumeAtRadiationDose DSRBasicCodedEntry("130017", "DCM", "Maximum Absolute Volume at Radiation Dose") +#define CODE_DCM_MinimizeMeterset DSRBasicCodedEntry("130018", "DCM", "Minimize Meterset") +#define CODE_DCM_SpecifiedRadiationDose DSRBasicCodedEntry("130019", "DCM", "Specified Radiation Dose") +#define CODE_DCM_SpecifiedVolumeSize DSRBasicCodedEntry("130020", "DCM", "Specified Volume Size") +#define CODE_DCM_SpecifiedVolumePercentage DSRBasicCodedEntry("130021", "DCM", "Specified Volume Percentage") +#define CODE_DCM_RadiationCharacteristicsNote DSRBasicCodedEntry("130022", "DCM", "Radiation Characteristics Note") +#define CODE_DCM_BeamShapingNote DSRBasicCodedEntry("130023", "DCM", "Beam Shaping Note") +#define CODE_DCM_TreatmentPlanningNote DSRBasicCodedEntry("130024", "DCM", "Treatment Planning Note") +#define CODE_DCM_SpecialProcedureNote DSRBasicCodedEntry("130025", "DCM", "Special Procedure Note") +#define CODE_DCM_PatientPositioningNote DSRBasicCodedEntry("130026", "DCM", "Patient Positioning Note") +#define CODE_DCM_4DRadiationTreatmentNote DSRBasicCodedEntry("130027", "DCM", "4D Radiation Treatment Note") +#define CODE_DCM_PatientSetupNote DSRBasicCodedEntry("130028", "DCM", "Patient Setup Note") +#define CODE_DCM_PreviousTreatmentNote DSRBasicCodedEntry("130029", "DCM", "Previous Treatment Note") +#define CODE_DCM_PlanningImagingNote DSRBasicCodedEntry("130030", "DCM", "Planning Imaging Note") +#define CODE_DCM_DeliveryVerificationNote DSRBasicCodedEntry("130031", "DCM", "Delivery Verification Note") +#define CODE_DCM_SimulationNote DSRBasicCodedEntry("130032", "DCM", "Simulation Note") +#define CODE_DCM_RadiationTherapyParticle DSRBasicCodedEntry("130033", "DCM", "Radiation Therapy Particle") +#define CODE_DCM_RTBeamEnergy DSRBasicCodedEntry("130034", "DCM", "RT Beam Energy") +#define CODE_DCM_PatientPositioningProcedureNote DSRBasicCodedEntry("130035", "DCM", "Patient Positioning Procedure Note") +#define CODE_DCM_QAProcessNote DSRBasicCodedEntry("130036", "DCM", "QA Process Note") +#define CODE_DCM_IonTherapyParticle DSRBasicCodedEntry("130037", "DCM", "Ion Therapy Particle") +#define CODE_DCM_BrachytherapyIsotope DSRBasicCodedEntry("130038", "DCM", "Brachytherapy Isotope") +#define CODE_DCM_AdaptiveRadiationTherapyNote DSRBasicCodedEntry("130039", "DCM", "Adaptive Radiation Therapy Note") +#define CODE_DCM_TeletherapyIsotope DSRBasicCodedEntry("130040", "DCM", "Teletherapy Isotope") +#define CODE_DCM_RTTarget DSRBasicCodedEntry("130041", "DCM", "RT Target") +#define CODE_DCM_RTDoseCalculationStructure DSRBasicCodedEntry("130042", "DCM", "RT Dose Calculation Structure") +#define CODE_DCM_RTGeometricInformation DSRBasicCodedEntry("130043", "DCM", "RT Geometric Information") +#define CODE_DCM_FixationOrPositioningDevice DSRBasicCodedEntry("130044", "DCM", "Fixation or Positioning Device") +#define CODE_DCM_BrachytherapyDevice DSRBasicCodedEntry("130045", "DCM", "Brachytherapy Device") +#define CODE_DCM_NonSpecificVolume DSRBasicCodedEntry("130046", "DCM", "Non-specific Volume") +#define CODE_DCM_ExternalBodyStructure DSRBasicCodedEntry("130047", "DCM", "External Body Structure") +#define CODE_DCM_UnclassifiedVolume DSRBasicCodedEntry("130048", "DCM", "Unclassified Volume") +#define CODE_DCM_CTVNodal DSRBasicCodedEntry("130049", "DCM", "CTV Nodal") +#define CODE_DCM_CTVPrimary DSRBasicCodedEntry("130050", "DCM", "CTV Primary") +#define CODE_DCM_GTVNodal DSRBasicCodedEntry("130051", "DCM", "GTV Nodal") +#define CODE_DCM_GTVPrimary DSRBasicCodedEntry("130052", "DCM", "GTV Primary") +#define CODE_DCM_PTVNodal DSRBasicCodedEntry("130053", "DCM", "PTV Nodal") +#define CODE_DCM_PTVPrimary DSRBasicCodedEntry("130054", "DCM", "PTV Primary") +#define CODE_DCM_EntireBodyTargetVolume DSRBasicCodedEntry("130055", "DCM", "Entire Body Target Volume") +#define CODE_DCM_ITV DSRBasicCodedEntry("130056", "DCM", "ITV") +#define CODE_DCM_PlanningOrganAtRiskVolume DSRBasicCodedEntry("130057", "DCM", "Planning Organ At Risk Volume") +#define CODE_DCM_AvoidanceVolume DSRBasicCodedEntry("130058", "DCM", "Avoidance Volume") +#define CODE_DCM_TreatedVolume DSRBasicCodedEntry("130059", "DCM", "Treated Volume") +#define CODE_DCM_OrganAtRisk DSRBasicCodedEntry("130060", "DCM", "Organ At Risk") +#define CODE_DCM_RadiationDoseShapingVolume DSRBasicCodedEntry("130061", "DCM", "Radiation Dose Shaping Volume") +#define CODE_DCM_ConformalityShell DSRBasicCodedEntry("130062", "DCM", "Conformality Shell") +#define CODE_DCM_RadiationDoseNormalizationPoint DSRBasicCodedEntry("130063", "DCM", "Radiation Dose Normalization Point") +#define CODE_DCM_RadiationDoseReferencePoint DSRBasicCodedEntry("130064", "DCM", "Radiation Dose Reference Point") +#define CODE_DCM_DoseCalculationBoundingVolume DSRBasicCodedEntry("130065", "DCM", "Dose Calculation Bounding Volume") +#define CODE_DCM_RadiationInteractionVolume DSRBasicCodedEntry("130066", "DCM", "Radiation Interaction Volume") +#define CODE_DCM_PatientAnatomyModel DSRBasicCodedEntry("130067", "DCM", "Patient Anatomy Model") +#define CODE_DCM_ExtendedPatientAnatomyModel DSRBasicCodedEntry("130068", "DCM", "Extended Patient Anatomy Model") +#define CODE_DCM_PatientSetupPoint DSRBasicCodedEntry("130069", "DCM", "Patient Setup Point") +#define CODE_DCM_RoomLaserPatientSetupPoint DSRBasicCodedEntry("130070", "DCM", "Room Laser Patient Setup Point") +#define CODE_DCM_MoveableLaserPatientSetupPoint DSRBasicCodedEntry("130071", "DCM", "Moveable Laser Patient Setup Point") +#define CODE_DCM_ReferenceAcquisitionPoint DSRBasicCodedEntry("130072", "DCM", "Reference Acquisition Point") +#define CODE_DCM_IsocentricTreatmentLocationPoint DSRBasicCodedEntry("130073", "DCM", "Isocentric Treatment Location Point") +#define CODE_DCM_SpecifiedConformityIndex DSRBasicCodedEntry("130074", "DCM", "Specified Conformity Index") +#define CODE_DCM_SpecifiedHealthyTissueConformityIndex DSRBasicCodedEntry("130075", "DCM", "Specified Healthy Tissue Conformity Index") +#define CODE_DCM_SpecifiedConformationNumber DSRBasicCodedEntry("130076", "DCM", "Specified Conformation Number") +#define CODE_DCM_SpecifiedHomogeneityIndex DSRBasicCodedEntry("130077", "DCM", "Specified Homogeneity Index") +#define CODE_DCM_BrachytherapySourceApplicator DSRBasicCodedEntry("130078", "DCM", "Brachytherapy Source Applicator") +#define CODE_DCM_BrachytherapyChannelShield DSRBasicCodedEntry("130079", "DCM", "Brachytherapy Channel Shield") +#define CODE_DCM_BrachytherapyChannel DSRBasicCodedEntry("130080", "DCM", "Brachytherapy Channel") +#define CODE_DCM_UnclassifiedCombination DSRBasicCodedEntry("130081", "DCM", "Unclassified Combination") +#define CODE_DCM_RelativeMassDensity DSRBasicCodedEntry("130082", "DCM", "Relative Mass Density") +#define CODE_DCM_RelativeElectronDensity DSRBasicCodedEntry("130083", "DCM", "Relative Electron Density") +#define CODE_DCM_EffectiveZ DSRBasicCodedEntry("130084", "DCM", "Effective Z") +#define CODE_DCM_EffectiveZPerA DSRBasicCodedEntry("130085", "DCM", "Effective Z per A") +#define CODE_DCM_RelativeLinearStoppingPower DSRBasicCodedEntry("130086", "DCM", "Relative Linear Stopping Power") +#define CODE_DCM_ReferenceEnergy DSRBasicCodedEntry("130087", "DCM", "Reference Energy") +#define CODE_DCM_LinearCellKillFactor DSRBasicCodedEntry("130088", "DCM", "Linear Cell Kill Factor") +#define CODE_DCM_QuadraticCellKillFactor DSRBasicCodedEntry("130089", "DCM", "Quadratic Cell Kill Factor") +#define CODE_DCM_HighDoseFractionLinearCellKillFactor DSRBasicCodedEntry("130090", "DCM", "High Dose Fraction Linear Cell Kill Factor") +#define CODE_DCM_HalfTimeForTissueRepair DSRBasicCodedEntry("130091", "DCM", "Half-time for Tissue Repair") +#define CODE_DCM_HighDoseFractionTransitionDose DSRBasicCodedEntry("130092", "DCM", "High Dose Fraction Transition Dose") +#define CODE_DCM_AtomicNumber DSRBasicCodedEntry("130093", "DCM", "Atomic Number") +#define CODE_DCM_ElementalCompositionAtomicMassFraction DSRBasicCodedEntry("130094", "DCM", "Elemental Composition Atomic Mass Fraction") +#define CODE_DCM_AlphaGEUDValue DSRBasicCodedEntry("130095", "DCM", "alpha gEUD Value") +#define CODE_DCM_SingleFraction DSRBasicCodedEntry("130096", "DCM", "Single Fraction") +#define CODE_DCM_StandardFractionation DSRBasicCodedEntry("130097", "DCM", "Standard Fractionation") +#define CODE_DCM_HypoFractionation DSRBasicCodedEntry("130098", "DCM", "Hypo-fractionation") +#define CODE_DCM_HyperFractionation DSRBasicCodedEntry("130099", "DCM", "Hyper-fractionation") +#define CODE_DCM_ContinuousTemporary DSRBasicCodedEntry("130100", "DCM", "Continuous Temporary") +#define CODE_DCM_ContinuousPermanent DSRBasicCodedEntry("130101", "DCM", "Continuous Permanent") +#define CODE_DCM_StaticBeam DSRBasicCodedEntry("130102", "DCM", "Static Beam") +#define CODE_DCM_ArcBeam DSRBasicCodedEntry("130103", "DCM", "Arc Beam") +#define CODE_DCM_ConformalArcBeam DSRBasicCodedEntry("130104", "DCM", "Conformal Arc Beam") +#define CODE_DCM_StepAndShootBeam DSRBasicCodedEntry("130105", "DCM", "Step and Shoot Beam") +#define CODE_DCM_SlidingWindowBeam DSRBasicCodedEntry("130106", "DCM", "Sliding Window Beam") +#define CODE_DCM_VMAT DSRBasicCodedEntry("130107", "DCM", "VMAT") +#define CODE_DCM_HelicalBeam DSRBasicCodedEntry("130108", "DCM", "Helical Beam") +#define CODE_DCM_TopographicBeam DSRBasicCodedEntry("130109", "DCM", "Topographic Beam") +#define CODE_DCM_Headframe DSRBasicCodedEntry("130110", "DCM", "Headframe") +#define CODE_DCM_HeadMask DSRBasicCodedEntry("130111", "DCM", "Head Mask") +#define CODE_DCM_HeadAndNeckMask DSRBasicCodedEntry("130112", "DCM", "Head and Neck Mask") +#define CODE_DCM_Mold DSRBasicCodedEntry("130113", "DCM", "Mold") +#define CODE_DCM_Cast DSRBasicCodedEntry("130114", "DCM", "Cast") +#define CODE_DCM_BreastBoard DSRBasicCodedEntry("130116", "DCM", "Breast Board") +#define CODE_DCM_BodyFrame DSRBasicCodedEntry("130117", "DCM", "Body Frame") +#define CODE_DCM_VacuumMold DSRBasicCodedEntry("130118", "DCM", "Vacuum Mold") +#define CODE_DCM_WholeBodyPod DSRBasicCodedEntry("130119", "DCM", "Whole Body Pod") +#define CODE_DCM_RectalBalloon DSRBasicCodedEntry("130120", "DCM", "Rectal Balloon") +#define CODE_DCM_VaginalCylinder DSRBasicCodedEntry("130121", "DCM", "Vaginal Cylinder") +#define CODE_DCM_ApertureBlock DSRBasicCodedEntry("130123", "DCM", "Aperture Block") +#define CODE_DCM_AccessoryTray DSRBasicCodedEntry("130124", "DCM", "Accessory Tray") +#define CODE_DCM_RadiotherapyApplicator DSRBasicCodedEntry("130125", "DCM", "Radiotherapy Applicator") +#define CODE_DCM_RadiationTransportBasedMethods DSRBasicCodedEntry("130126", "DCM", "Radiation transport-based methods") +#define CODE_DCM_FractionationBasedOrTemporallyBasedMethods DSRBasicCodedEntry("130127", "DCM", "Fractionation-based or temporally-based methods") +#define CODE_DCM_LocalEffectModel DSRBasicCodedEntry("130128", "DCM", "Local Effect Model") +#define CODE_DCM_MicrodosimetricKineticModel DSRBasicCodedEntry("130129", "DCM", "Microdosimetric Kinetic Model") +#define CODE_DCM_Equivalent2GrayFractionsModel DSRBasicCodedEntry("130130", "DCM", "Equivalent 2-Gray Fractions Model") +#define CODE_DCM_LinearQuadraticModel DSRBasicCodedEntry("130131", "DCM", "Linear-Quadratic Model") +#define CODE_DCM_LinearQuadraticModelWithTimeFactor DSRBasicCodedEntry("130132", "DCM", "Linear-Quadratic Model with Time Factor") +#define CODE_DCM_LinearQuadraticLinearModel DSRBasicCodedEntry("130133", "DCM", "Linear-Quadratic-Linear Model") +#define CODE_DCM_LinearQuadraticModelForLowDoseRateBrachytherapy DSRBasicCodedEntry("130134", "DCM", "Linear-Quadratic Model for Low-Dose Rate Brachytherapy") +#define CODE_DCM_HistoricalRTPrescription DSRBasicCodedEntry("130135", "DCM", "Historical RT Prescription") +#define CODE_DCM_RTPrescriptionInputImages DSRBasicCodedEntry("130136", "DCM", "RT Prescription Input Images") +#define CODE_DCM_RTTreatmentPlanningInputImages DSRBasicCodedEntry("130137", "DCM", "RT Treatment Planning Input Images") +#define CODE_DCM_MultipleFixedSources DSRBasicCodedEntry("130138", "DCM", "Multiple Fixed Sources") +#define CODE_DCM_SynchronizedRoboticTreatment DSRBasicCodedEntry("130139", "DCM", "Synchronized Robotic Treatment") +#define CODE_DCM_NonSynchronizedRoboticTreatment DSRBasicCodedEntry("130140", "DCM", "Non-Synchronized Robotic Treatment") +#define CODE_DCM_3HeliumNucleus DSRBasicCodedEntry("130141", "DCM", "^3^Helium nucleus") +#define CODE_DCM_4HeliumNucleus DSRBasicCodedEntry("130142", "DCM", "^4^Helium nucleus") +#define CODE_DCM_12CarbonNucleus DSRBasicCodedEntry("130143", "DCM", "^12^Carbon nucleus") +#define CODE_DCM_16OxygenNucleus DSRBasicCodedEntry("130144", "DCM", "^16^Oxygen nucleus") +#define CODE_DCM_PressureAboveWarningLimit DSRBasicCodedEntry("130150", "DCM", "Pressure above warning limit") +#define CODE_DCM_PressureAboveAdjustmentLimit DSRBasicCodedEntry("130151", "DCM", "Pressure above adjustment limit") +#define CODE_DCM_FlowRateAboveWarningLimit DSRBasicCodedEntry("130152", "DCM", "Flow rate above warning limit") +#define CODE_DCM_FlowRateAboveAdjustmentLimit DSRBasicCodedEntry("130153", "DCM", "Flow rate above adjustment limit") +#define CODE_DCM_TerminatedDueToRequestFromOperator DSRBasicCodedEntry("130154", "DCM", "Terminated due to request from operator") +#define CODE_DCM_FixedDurationPauseEnded DSRBasicCodedEntry("130155", "DCM", "Fixed duration pause ended") +#define CODE_DCM_TerminatedDueToPressureAboveTerminationLimit DSRBasicCodedEntry("130156", "DCM", "Terminated due to pressure above termination limit") +#define CODE_DCM_TerminatedDueToFlowRateAboveTerminationLimit DSRBasicCodedEntry("130157", "DCM", "Terminated due to flow rate above termination limit") +#define CODE_DCM_TerminatedDueToExcessiveDurationPause DSRBasicCodedEntry("130158", "DCM", "Terminated due to excessive duration pause") +#define CODE_DCM_TerminatedDueToInjectorCommunicationLoss DSRBasicCodedEntry("130159", "DCM", "Terminated due to injector communication loss") +#define CODE_DCM_TerminatedDueToUnspecifiedInjectorFailure DSRBasicCodedEntry("130160", "DCM", "Terminated due to unspecified injector failure") +#define CODE_DCM_KeepVeinOpenStarted DSRBasicCodedEntry("130161", "DCM", "Keep vein open started") +#define CODE_DCM_KeepVeinOpenEnded DSRBasicCodedEntry("130162", "DCM", "Keep vein open ended") +#define CODE_DCM_SyringeAttached DSRBasicCodedEntry("130163", "DCM", "Syringe attached") +#define CODE_DCM_SyringeDetached DSRBasicCodedEntry("130164", "DCM", "Syringe detached") +#define CODE_DCM_TotalKeepVeinOpenVolumeAdministered DSRBasicCodedEntry("130165", "DCM", "Total Keep Vein Open Volume Administered") +#define CODE_DCM_AutomaticAdministrationPhase DSRBasicCodedEntry("130168", "DCM", "Automatic Administration Phase") +#define CODE_DCM_AutomaticProgrammedHoldPhase DSRBasicCodedEntry("130169", "DCM", "Automatic Programmed Hold Phase") +#define CODE_DCM_AutomaticWithManualHoldPhase DSRBasicCodedEntry("130170", "DCM", "Automatic with Manual Hold Phase") +#define CODE_DCM_AutomaticWithManualInjectPhase DSRBasicCodedEntry("130171", "DCM", "Automatic with Manual Inject Phase") +#define CODE_DCM_ManuallyTriggeredInjectionInformation DSRBasicCodedEntry("130172", "DCM", "Manually Triggered Injection Information") +#define CODE_DCM_AutomatedAdministration DSRBasicCodedEntry("130173", "DCM", "Automated Administration") +#define CODE_DCM_ManualAdministration DSRBasicCodedEntry("130174", "DCM", "Manual Administration") +#define CODE_DCM_AirDetected DSRBasicCodedEntry("130175", "DCM", "Air detected") +#define CODE_DCM_TerminatedDueToAirDetected DSRBasicCodedEntry("130176", "DCM", "Terminated due to air detected") +#define CODE_DCM_TerminatedByScanner DSRBasicCodedEntry("130177", "DCM", "Terminated by scanner") +#define CODE_DCM_TerminatedDueToCriticalBatteryLevel DSRBasicCodedEntry("130178", "DCM", "Terminated due to critical battery level") +#define CODE_DCM_TerminatedDueToConsumableRemoval DSRBasicCodedEntry("130179", "DCM", "Terminated due to consumable removal") +#define CODE_DCM_AdministrationMode DSRBasicCodedEntry("130181", "DCM", "Administration Mode") +#define CODE_DCM_PlannedImagingAgentAdministrationProcedureReport DSRBasicCodedEntry("130182", "DCM", "Planned Imaging Agent Administration Procedure Report") +#define CODE_DCM_ImagingAgentInformation DSRBasicCodedEntry("130183", "DCM", "Imaging Agent Information") +#define CODE_DCM_OsmolalityAt37C DSRBasicCodedEntry("130184", "DCM", "Osmolality at 37C") +#define CODE_DCM_OsmolarityAt37C DSRBasicCodedEntry("130185", "DCM", "Osmolarity at 37C") +#define CODE_DCM_ViscosityAt37C DSRBasicCodedEntry("130186", "DCM", "Viscosity at 37C") +#define CODE_DCM_ImagingAgentWarmed DSRBasicCodedEntry("130187", "DCM", "Imaging Agent Warmed") +#define CODE_DCM_ContrastTransverseRelaxivity DSRBasicCodedEntry("130188", "DCM", "Contrast Transverse Relaxivity") +#define CODE_DCM_IsIonic DSRBasicCodedEntry("130189", "DCM", "Is Ionic") +#define CODE_DCM_DosingFactor DSRBasicCodedEntry("130190", "DCM", "Dosing Factor") +#define CODE_DCM_ImagingAgentComponentUsage DSRBasicCodedEntry("130191", "DCM", "Imaging Agent Component Usage") +#define CODE_DCM_ImagingAgentAdministrationSteps DSRBasicCodedEntry("130192", "DCM", "Imaging Agent Administration Steps") +#define CODE_DCM_PressureLimit DSRBasicCodedEntry("130193", "DCM", "Pressure Limit") +#define CODE_DCM_TimeAfterTheStartOfInjection DSRBasicCodedEntry("130194", "DCM", "Time after the start of injection") +#define CODE_DCM_ImagingAgentAdministrationStep DSRBasicCodedEntry("130195", "DCM", "Imaging Agent Administration Step") +#define CODE_DCM_ImagingAgentAdministrationStepIdentifier DSRBasicCodedEntry("130196", "DCM", "Imaging Agent Administration Step Identifier") +#define CODE_DCM_ImagingAgentAdministrationDelay DSRBasicCodedEntry("130197", "DCM", "Imaging Agent Administration Delay") +#define CODE_DCM_ScanDelay DSRBasicCodedEntry("130198", "DCM", "Scan Delay") +#define CODE_DCM_ImagingAgentAdministrationStepsDescription DSRBasicCodedEntry("130199", "DCM", "Imaging Agent Administration Steps Description") +#define CODE_DCM_ImagingAgentAdministrationProtocolName DSRBasicCodedEntry("130200", "DCM", "Imaging Agent Administration Protocol Name") +#define CODE_DCM_ImagingAgentAdministrationPhase DSRBasicCodedEntry("130202", "DCM", "Imaging Agent Administration Phase") +#define CODE_DCM_ImagingAgentAdministrationPhaseIdentifier DSRBasicCodedEntry("130203", "DCM", "Imaging Agent Administration Phase Identifier") +#define CODE_DCM_ImagingAgentAdministrationPhaseType DSRBasicCodedEntry("130204", "DCM", "Imaging Agent Administration Phase Type") +#define CODE_DCM_InitialVolumeOfImagingAgentInContainer DSRBasicCodedEntry("130205", "DCM", "Initial Volume of Imaging Agent in Container") +#define CODE_DCM_ResidualVolumeOfImagingAgentInContainer DSRBasicCodedEntry("130206", "DCM", "Residual Volume of Imaging Agent in Container") +#define CODE_DCM_RiseTime DSRBasicCodedEntry("130207", "DCM", "Rise Time") +#define CODE_DCM_StartingFlowRateOfAdministration DSRBasicCodedEntry("130208", "DCM", "Starting Flow Rate of administration") +#define CODE_DCM_EndingFlowRateOfAdministration DSRBasicCodedEntry("130209", "DCM", "Ending Flow Rate of administration") +#define CODE_DCM_BolusShapingCurve DSRBasicCodedEntry("130210", "DCM", "Bolus Shaping Curve") +#define CODE_DCM_ImagingAgentAdministrationCompletionStatus DSRBasicCodedEntry("130211", "DCM", "Imaging Agent Administration Completion Status") +#define CODE_DCM_ImagingAgentAdministrationAdverseEvents DSRBasicCodedEntry("130212", "DCM", "Imaging Agent Administration Adverse Events") +#define CODE_DCM_EstimatedExtravasationVolume DSRBasicCodedEntry("130214", "DCM", "Estimated Extravasation Volume") +#define CODE_DCM_AdverseEventDetectionDateTime DSRBasicCodedEntry("130215", "DCM", "Adverse Event Detection DateTime") +#define CODE_DCM_ReferencedImagingAgentAdministrationStepUID DSRBasicCodedEntry("130216", "DCM", "Referenced Imaging Agent Administration Step UID") +#define CODE_DCM_ReferencedImagingAgentAdministrationPhaseIdentifier DSRBasicCodedEntry("130217", "DCM", "Referenced Imaging Agent Administration Phase Identifier") +#define CODE_DCM_ProgrammableDevice DSRBasicCodedEntry("130218", "DCM", "Programmable Device") +#define CODE_DCM_NumberOfInjectorHeads DSRBasicCodedEntry("130219", "DCM", "Number of Injector Heads") +#define CODE_DCM_AdministrationDiscontinued DSRBasicCodedEntry("130220", "DCM", "Administration discontinued") +#define CODE_DCM_ImagingAgentVolumePerUnitOfPresentation DSRBasicCodedEntry("130221", "DCM", "Imaging Agent Volume per Unit of Presentation") +#define CODE_DCM_ImagingAgentAdministrationConsumable DSRBasicCodedEntry("130222", "DCM", "Imaging Agent Administration Consumable") +#define CODE_DCM_ImagingAgentAdministrationConsumableType DSRBasicCodedEntry("130223", "DCM", "Imaging Agent Administration Consumable Type") +#define CODE_DCM_ConsumableIsNew DSRBasicCodedEntry("130224", "DCM", "Consumable is New") +#define CODE_DCM_PlannedImagingAgentAdministration DSRBasicCodedEntry("130226", "DCM", "Planned Imaging Agent Administration") +#define CODE_DCM_PerformedImagingAgentAdministration DSRBasicCodedEntry("130227", "DCM", "Performed Imaging Agent Administration") +#define CODE_DCM_ContrastVolumeLimit DSRBasicCodedEntry("130228", "DCM", "Contrast Volume Limit") +#define CODE_DCM_FlowRateVsTime DSRBasicCodedEntry("130229", "DCM", "Flow Rate vs Time") +#define CODE_DCM_PressureVsTime DSRBasicCodedEntry("130230", "DCM", "Pressure vs Time") +#define CODE_DCM_BarcodeValue DSRBasicCodedEntry("130231", "DCM", "Barcode Value") +#define CODE_DCM_ImagingAgentAdministrationGraph DSRBasicCodedEntry("130232", "DCM", "Imaging Agent Administration Graph") +#define CODE_DCM_ImagingAgentAdministrationInjectorEvents DSRBasicCodedEntry("130233", "DCM", "Imaging Agent Administration Injector Events") +#define CODE_DCM_ImagingAgentAdministrationInjectorEventType DSRBasicCodedEntry("130234", "DCM", "Imaging Agent Administration Injector Event Type") +#define CODE_DCM_InjectorEventDetectionDateTime DSRBasicCodedEntry("130235", "DCM", "Injector Event Detection DateTime") +#define CODE_DCM_PlannedImagingAgentAdministrationSOPInstance DSRBasicCodedEntry("130236", "DCM", "Planned Imaging Agent Administration SOP Instance") +#define CODE_DCM_ImagingAgentAdministrationSyringePumpPhaseActivity DSRBasicCodedEntry("130237", "DCM", "Imaging Agent Administration Syringe/Pump Phase Activity") +#define CODE_DCM_ImagingAgentComponent DSRBasicCodedEntry("130238", "DCM", "Imaging Agent Component") +#define CODE_DCM_ComponentVolume DSRBasicCodedEntry("130239", "DCM", "Component Volume") +#define CODE_DCM_TotalPhaseVolumeAdministered DSRBasicCodedEntry("130240", "DCM", "Total Phase Volume Administered") +#define CODE_DCM_TotalStepVolumeAdministered DSRBasicCodedEntry("130241", "DCM", "Total Step Volume Administered") +#define CODE_DCM_TotalNumberOfManuallyTriggeredInjections DSRBasicCodedEntry("130242", "DCM", "Total number of manually triggered injections") +#define CODE_DCM_PeakFlowRateInPhaseActivity DSRBasicCodedEntry("130244", "DCM", "Peak Flow Rate in Phase Activity") +#define CODE_DCM_PeakPressureInPhaseActivity DSRBasicCodedEntry("130245", "DCM", "Peak Pressure in Phase Activity") +#define CODE_DCM_ImagingAgentAdministrationPerformedStepUID DSRBasicCodedEntry("130246", "DCM", "Imaging Agent Administration Performed Step UID") +#define CODE_DCM_PatencyTestInjection DSRBasicCodedEntry("130247", "DCM", "Patency Test Injection") +#define CODE_DCM_TransitTimeTestInjection DSRBasicCodedEntry("130248", "DCM", "Transit Time Test Injection") +#define CODE_DCM_DiagnosticAdministration DSRBasicCodedEntry("130249", "DCM", "Diagnostic Administration") +#define CODE_DCM_AdministrationStepType DSRBasicCodedEntry("130250", "DCM", "Administration Step Type") +#define CODE_DCM_FlushAdministration DSRBasicCodedEntry("130251", "DCM", "Flush Administration") +#define CODE_DCM_NegativeExponential DSRBasicCodedEntry("130252", "DCM", "Negative exponential") +#define CODE_DCM_LinearCurve DSRBasicCodedEntry("130253", "DCM", "Linear Curve") +#define CODE_DCM_ImagingAgentIdentifier DSRBasicCodedEntry("130254", "DCM", "Imaging Agent Identifier") +#define CODE_DCM_ReferencedImagingAgentIdentifier DSRBasicCodedEntry("130255", "DCM", "Referenced Imaging Agent Identifier") +#define CODE_DCM_ConsumableCatheterType DSRBasicCodedEntry("130257", "DCM", "Consumable Catheter Type") +#define CODE_DCM_ContrastReactionProphylacticAgent DSRBasicCodedEntry("130259", "DCM", "Contrast Reaction Prophylactic Agent") +#define CODE_DCM_ImagingAgentAdministrationPerformedPhaseUID DSRBasicCodedEntry("130261", "DCM", "Imaging Agent Administration Performed Phase UID") +#define CODE_DCM_ReferencedImagingAgentAdministrationPhaseUID DSRBasicCodedEntry("130262", "DCM", "Referenced Imaging Agent Administration Phase UID") +#define CODE_DCM_SkinOfParaspinalAreaOfTheNeck DSRBasicCodedEntry("130300", "DCM", "Skin of paraspinal area of the neck") +#define CODE_DCM_SkinOfParaspinalAreaOfTheSuperiorBack DSRBasicCodedEntry("130301", "DCM", "Skin of paraspinal area of the superior back") +#define CODE_DCM_SkinOfUpperParaspinalRegion DSRBasicCodedEntry("130302", "DCM", "Skin of upper paraspinal region") +#define CODE_DCM_SkinOfMidParaspinalRegion DSRBasicCodedEntry("130303", "DCM", "Skin of mid paraspinal region") +#define CODE_DCM_SkinOfLowerParaspinalRegion DSRBasicCodedEntry("130304", "DCM", "Skin of lower paraspinal region") +#define CODE_DCM_SkinOfAnteriorHelixOfEar DSRBasicCodedEntry("130305", "DCM", "Skin of anterior helix of ear") +#define CODE_DCM_SkinOfCaruncleOfEye DSRBasicCodedEntry("130306", "DCM", "Skin of caruncle of eye") +#define CODE_DCM_SkinOfInferiorHelixOfEar DSRBasicCodedEntry("130307", "DCM", "Skin of inferior helix of ear") +#define CODE_DCM_SkinOfInferiorPosteriorSurfaceOfThePinna DSRBasicCodedEntry("130308", "DCM", "Skin of inferior posterior surface of the pinna") +#define CODE_DCM_SkinOfLateralPartOfDorsumOfFoot DSRBasicCodedEntry("130309", "DCM", "Skin of lateral part of dorsum of foot") +#define CODE_DCM_SkinOfLowerAntihelixOfEar DSRBasicCodedEntry("130310", "DCM", "Skin of lower antihelix of ear") +#define CODE_DCM_SkinOfLowerEyelidMargin DSRBasicCodedEntry("130311", "DCM", "Skin of lower eyelid margin") +#define CODE_DCM_SkinOfInfraalarGroove DSRBasicCodedEntry("130312", "DCM", "Skin of infraalar groove") +#define CODE_DCM_SkinOfMedialPartOfDorsumOfFoot DSRBasicCodedEntry("130313", "DCM", "Skin of medial part of dorsum of foot") +#define CODE_DCM_SkinOfParanasalCheek DSRBasicCodedEntry("130314", "DCM", "Skin of paranasal cheek") +#define CODE_DCM_SkinOfPosteriorHelixOfEar DSRBasicCodedEntry("130315", "DCM", "Skin of posterior helix of ear") +#define CODE_DCM_SkinOfPosteriorLobuleOfTheEar DSRBasicCodedEntry("130316", "DCM", "Skin of posterior lobule of the ear") +#define CODE_DCM_SkinOfSoleOfForefoot DSRBasicCodedEntry("130317", "DCM", "Skin of sole of forefoot") +#define CODE_DCM_SkinOfSuperiorAntihelixOfEar DSRBasicCodedEntry("130318", "DCM", "Skin of superior antihelix of ear") +#define CODE_DCM_SkinOfSuperiorPosteriorHelixOfEar DSRBasicCodedEntry("130319", "DCM", "Skin of superior posterior helix of ear") +#define CODE_DCM_SkinOfSuperiorPosteriorSurfaceOfThePinna DSRBasicCodedEntry("130320", "DCM", "Skin of superior posterior surface of the pinna") +#define CODE_DCM_SkinOfUpperAntihelixOfEar DSRBasicCodedEntry("130321", "DCM", "Skin of upper antihelix of ear") +#define CODE_DCM_SkinOfUpperEyelidMargin DSRBasicCodedEntry("130322", "DCM", "Skin of upper eyelid margin") +#define CODE_DCM_SkinOfMidBack DSRBasicCodedEntry("130323", "DCM", "Skin of mid back") #endif diff --git a/dcmsr/include/dcmtk/dcmsr/codes/ncit.h b/dcmsr/include/dcmtk/dcmsr/codes/ncit.h index 0888b2d2..c64cf327 100644 --- a/dcmsr/include/dcmtk/dcmsr/codes/ncit.h +++ b/dcmsr/include/dcmtk/dcmsr/codes/ncit.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file with NCI Thesaurus Code Definitions (Coding Scheme "NCIt") * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:45:13 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019c + * File created on 2019-06-19 17:38:36 by J. Riesmeier * */ @@ -34,7 +34,7 @@ * code definitions * *--------------------*/ -// total number of codes: 24 +// total number of codes: 36 // - retired: 0 // - no name: 0 // - not unique: 0 @@ -48,21 +48,32 @@ // The "cleaned camel-case version of the code meaning" is an attempt to map the free text // description of the code meaning to a compiler-friendly but still human-readable representation. +#define CODE_NCIt_EnhancingLesion DSRBasicCodedEntry("C113842", "NCIt", "Enhancing Lesion") #define CODE_NCIt_RANO DSRBasicCodedEntry("C114879", "NCIt", "RANO") -#define CODE_NCIt_PSMA_Ga68 DSRBasicCodedEntry("C118961", "NCIt", "PSMA Ga^68^") +#define CODE_NCIt_DCFPyL_F18 DSRBasicCodedEntry("C116352", "NCIt", "DCFPyL F^18^") +#define CODE_NCIt_Technetium99mTrofolastat DSRBasicCodedEntry("C116887", "NCIt", "Technetium^99m Trofolastat") +#define CODE_NCIt_PSMA11_Ga68 DSRBasicCodedEntry("C118961", "NCIt", "PSMA-11 Ga^68^") #define CODE_NCIt_Sarcosine_C11 DSRBasicCodedEntry("C122684", "NCIt", "Sarcosine C^11^") #define CODE_NCIt_MouseMammaryFatPad DSRBasicCodedEntry("C22550", "NCIt", "Mouse mammary fat pad") +#define CODE_NCIt_Middle DSRBasicCodedEntry("C25569", "NCIt", "Middle") #define CODE_NCIt_Reader DSRBasicCodedEntry("C28747", "NCIt", "Reader") #define CODE_NCIt_BronchioloalveolarAdenocarcinoma DSRBasicCodedEntry("C2923", "NCIt", "Bronchioloalveolar adenocarcinoma") +#define CODE_NCIt_ClinicalCourseOfDisease DSRBasicCodedEntry("C35461", "NCIt", "Clinical course of disease") #define CODE_NCIt_Enrollment DSRBasicCodedEntry("C37948", "NCIt", "Enrollment") +#define CODE_NCIt_RecurrentDisease DSRBasicCodedEntry("C38155", "NCIt", "Recurrent Disease") #define CODE_NCIt_ExtraluminalRoute DSRBasicCodedEntry("C38213", "NCIt", "Extraluminal route") #define CODE_NCIt_IntraepithelialRoute DSRBasicCodedEntry("C38244", "NCIt", "Intraepithelial route") #define CODE_NCIt_TransluminalRoute DSRBasicCodedEntry("C38306", "NCIt", "Transluminal route") +#define CODE_NCIt_NoEvidenceOfDisease DSRBasicCodedEntry("C40413", "NCIt", "No Evidence of Disease") +#define CODE_NCIt_NativeHawaiianOrOtherPacificIslander DSRBasicCodedEntry("C41219", "NCIt", "Native Hawaiian or other Pacific Islander") +#define CODE_NCIt_AdverseEvent DSRBasicCodedEntry("C41331", "NCIt", "Adverse Event") #define CODE_NCIt_TemperatureSensorDeviceComponent DSRBasicCodedEntry("C50304", "NCIt", "Temperature sensor device component") #define CODE_NCIt_Reviewer DSRBasicCodedEntry("C54634", "NCIt", "Reviewer") #define CODE_NCIt_AdLibitum DSRBasicCodedEntry("C64636", "NCIt", "ad libitum") #define CODE_NCIt_ActivitySession DSRBasicCodedEntry("C67447", "NCIt", "Activity Session") #define CODE_NCIt_UnitConversionFactor DSRBasicCodedEntry("C70774", "NCIt", "Unit Conversion Factor") +#define CODE_NCIt_MedicalProductExpirationDate DSRBasicCodedEntry("C70854", "NCIt", "Medical Product Expiration Date") +#define CODE_NCIt_NonEnhancingLesion DSRBasicCodedEntry("C81175", "NCIt", "Non-Enhancing Lesion") #define CODE_NCIt_Erect DSRBasicCodedEntry("C86043", "NCIt", "erect") #define CODE_NCIt_BeddingChange DSRBasicCodedEntry("C90365", "NCIt", "Bedding change") #define CODE_NCIt_BeddingMaterial DSRBasicCodedEntry("C90366", "NCIt", "Bedding material") @@ -71,6 +82,7 @@ #define CODE_NCIt_LightCycle DSRBasicCodedEntry("C90419", "NCIt", "Light cycle") #define CODE_NCIt_WaterDelivery DSRBasicCodedEntry("C90486", "NCIt", "Water delivery") #define CODE_NCIt_ReferenceRegion DSRBasicCodedEntry("C94970", "NCIt", "Reference Region") +#define CODE_NCIt_DCFBC_F18 DSRBasicCodedEntry("C96234", "NCIt", "DCFBC F^18^") #define CODE_NCIt_Adjudicator DSRBasicCodedEntry("C96561", "NCIt", "Adjudicator") #endif diff --git a/dcmsr/include/dcmtk/dcmsr/codes/sct.h b/dcmsr/include/dcmtk/dcmsr/codes/sct.h new file mode 100644 index 00000000..1ca5d6f0 --- /dev/null +++ b/dcmsr/include/dcmtk/dcmsr/codes/sct.h @@ -0,0 +1,68 @@ +/* + * + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany + * All rights reserved. See COPYRIGHT file for details. + * + * Header file with SNOMED-CT Code Definitions (Coding Scheme "SCT") + * + * Generated semi-automatically from DICOM PS 3.16-2015c (for "SRT") + * File created on 2019-04-11 by J. Riesmeier + * Last modified on 2019-04-11 by J. Riesmeier + * + * NB: This file does not yet contain all codes defined in PS 3.16 since the + * mapping of the code meaning to a compiler-friendly representation is + * much more complex than for other coding schemes. + * + */ + + +#ifndef CODES_SCT_H +#define CODES_SCT_H + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmsr/dsrcodvl.h" + + +/*-----------------------* + * general information * + *-----------------------*/ + +#define CODE_SCT_CodingSchemeDesignator "SCT" +#define CODE_SCT_CodingSchemeName "SNOMED CT" +#define CODE_SCT_CodingSchemeDescription "SNOMED, using the CT code values" +#define CODE_SCT_CodingSchemeUID "2.16.840.1.113883.6.96" + + +/*--------------------* + * code definitions * + *--------------------*/ + +// The basic scheme for creating the names is as follows: +// 'CODE_' + + ['_RETIRED'] + '_' + +// where is "SCT" and is either +// - a cleaned camel-case version of the code meaning (if unique within this coding scheme) or +// - a cleaned camel-case version of the code meaning with an underscore and the code value appended or +// - simply the code value with an underscore character appended (if code meaning contains an equation). +// The "cleaned camel-case version of the code meaning" is an attempt to map the free text +// description of the code meaning to a compiler-friendly but still human-readable representation. + +#define CODE_SCT_Radionuclide DSRBasicCodedEntry("89457008", "SCT", "Radionuclide") +#define CODE_SCT_18_Fluorine DSRBasicCodedEntry("77004003", "SCT", "^18^Fluorine") +#define CODE_SCT_Fluorodeoxyglucose_F18 DSRBasicCodedEntry("35321007", "SCT", "Fluorodeoxyglucose F^18^") +#define CODE_SCT_RadiopharmaceuticalAgent DSRBasicCodedEntry("417881006", "SCT", "Radiopharmaceutical agent") +#define CODE_SCT_TopographicalModifier DSRBasicCodedEntry("106233006", "SCT", "Topographical modifier") +#define CODE_SCT_MeasurementMethod DSRBasicCodedEntry("370129005", "SCT", "Measurement Method") +#define CODE_SCT_FindingSite DSRBasicCodedEntry("363698007", "SCT", "Finding Site") +#define CODE_SCT_Laterality DSRBasicCodedEntry("272741003", "SCT", "Laterality") +#define CODE_SCT_RouteOfAdministration DSRBasicCodedEntry("410675002", "SCT", "Route of Administration") +#define CODE_SCT_Neoplasm_Primary DSRBasicCodedEntry("86049000", "SCT", "Neoplasm, Primary") +#define CODE_SCT_Neoplasm_Secondary DSRBasicCodedEntry("14799000", "SCT", "Neoplasm, Secondary") +#define CODE_SCT_ImagingProcedure DSRBasicCodedEntry("363679005", "SCT", "Imaging procedure") +#define CODE_SCT_HalfLifeOfRadiopharmaceutical DSRBasicCodedEntry("304283002", "SCT", "Half-life of radiopharmaceutical") +#define CODE_SCT_AorticArch DSRBasicCodedEntry("57034009", "SCT", "Aortic arch") +#define CODE_SCT_Liver DSRBasicCodedEntry("10200004", "SCT", "Liver") +#define CODE_SCT_Cerebellum DSRBasicCodedEntry("113305005", "SCT", "Cerebellum") +#define CODE_SCT_LymphNode DSRBasicCodedEntry("59441001", "SCT", "Lymph node") + +#endif diff --git a/dcmsr/include/dcmtk/dcmsr/codes/srt.h b/dcmsr/include/dcmtk/dcmsr/codes/srt.h index 85b2699b..0045329b 100644 --- a/dcmsr/include/dcmtk/dcmsr/codes/srt.h +++ b/dcmsr/include/dcmtk/dcmsr/codes/srt.h @@ -1,13 +1,13 @@ /* * - * Copyright (C) 2015-2017, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file with SNOMED-RT Code Definitions (Coding Scheme "SRT") * * Generated semi-automatically from DICOM PS 3.16-2015c * File created on 2015-08-24 by J. Riesmeier - * Last modified on 2017-07-31 by Riesmeier + * Last modified on 2019-04-11 by J. Riesmeier * * NB: This file does not yet contain all codes defined in PS 3.16 since the * mapping of the code meaning to a compiler-friendly representation is @@ -28,8 +28,13 @@ * general information * *-----------------------*/ +// DICOM PS3.16 states: +// "This coding scheme is deprecated. The use of 'SNOMED-RT style' code values +// is no longer authorized by SNOMED except for creation by legacy devices, +// legacy objects in archives, and receiving systems that need to understand them." + #define CODE_SRT_CodingSchemeDesignator "SRT" -#define CODE_SRT_CodingSchemeName "SNOMED-RT" +#define CODE_SRT_CodingSchemeName "SNOMED RT" #define CODE_SRT_CodingSchemeDescription "SNOMED, using the 'SNOMED-RT style' code values" #define CODE_SRT_CodingSchemeUID "2.16.840.1.113883.6.96" diff --git a/dcmsr/include/dcmtk/dcmsr/codes/ucum.h b/dcmsr/include/dcmtk/dcmsr/codes/ucum.h index 53c4a495..8e1a9a6f 100644 --- a/dcmsr/include/dcmtk/dcmsr/codes/ucum.h +++ b/dcmsr/include/dcmtk/dcmsr/codes/ucum.h @@ -7,7 +7,7 @@ * * Generated semi-automatically from DICOM PS 3.16-2015c * File created on 2015-08-24 by J. Riesmeier - * Last modified on 2017-03-08 by Riesmeier + * Last modified on 2017-03-08 by J. Riesmeier * * NB: This file does not yet contain all codes defined in PS 3.16 since the * mapping of the code meaning to a compiler-friendly representation is diff --git a/dcmsr/include/dcmtk/dcmsr/codes/umls.h b/dcmsr/include/dcmtk/dcmsr/codes/umls.h index cbada76a..b6fcb095 100644 --- a/dcmsr/include/dcmtk/dcmsr/codes/umls.h +++ b/dcmsr/include/dcmtk/dcmsr/codes/umls.h @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Header file with UMLS Code Definitions (Coding Scheme "UMLS") * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:45:12 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 16:52:49 by J. Riesmeier * */ @@ -34,7 +34,7 @@ * code definitions * *--------------------*/ -// total number of codes: 43 +// total number of codes: 50 // - retired: 0 // - no name: 0 // - not unique: 0 @@ -64,8 +64,10 @@ #define CODE_UMLS_HeatLamp DSRBasicCodedEntry("C0181514", "UMLS", "Heat lamp") #define CODE_UMLS_UnknownPrimaryNeoplasiaSite DSRBasicCodedEntry("C0221297", "UMLS", "unknown primary neoplasia site") #define CODE_UMLS_RestrictedDiet DSRBasicCodedEntry("C0425422", "UMLS", "Restricted diet") +#define CODE_UMLS_Duration DSRBasicCodedEntry("C0449238", "UMLS", "Duration") #define CODE_UMLS_InfantOfMotherWithGestationalDiabetes DSRBasicCodedEntry("C0456029", "UMLS", "Infant of mother with gestational diabetes") #define CODE_UMLS_CoefficientOfVariance DSRBasicCodedEntry("C0681921", "UMLS", "Coefficient of Variance") +#define CODE_UMLS_ManufacturerName DSRBasicCodedEntry("C0947322", "UMLS", "Manufacturer Name") #define CODE_UMLS_Intern DSRBasicCodedEntry("C1144859", "UMLS", "Intern") #define CODE_UMLS_ConsultingPhysician DSRBasicCodedEntry("C1441532", "UMLS", "Consulting Physician") #define CODE_UMLS_Baseline DSRBasicCodedEntry("C1442488", "UMLS", "Baseline") @@ -91,5 +93,10 @@ #define CODE_UMLS_Pretreatment DSRBasicCodedEntry("C3539075", "UMLS", "Pretreatment") #define CODE_UMLS_DistalPhalanx DSRBasicCodedEntry("C3669027", "UMLS", "Distal phalanx") #define CODE_UMLS_RoomAir DSRBasicCodedEntry("C3846005", "UMLS", "Room air") +#define CODE_UMLS_THK5351_F18 DSRBasicCodedEntry("C4279748", "UMLS", "THK5351 F^18^") +#define CODE_UMLS_MK6240_F18 DSRBasicCodedEntry("C4506764", "UMLS", "MK-6240 F^18^") +#define CODE_UMLS_UCBJ_C11 DSRBasicCodedEntry("C4506788", "UMLS", "UCB-J C^11^") +#define CODE_UMLS_Flortaucipir_F18 DSRBasicCodedEntry("C4547429", "UMLS", "Flortaucipir F^18^") +#define CODE_UMLS_THK5317_F18 DSRBasicCodedEntry("C4550127", "UMLS", "THK5317 F^18^") #endif diff --git a/dcmsr/include/dcmtk/dcmsr/dsracqcc.h b/dcmsr/include/dcmtk/dcmsr/dsracqcc.h index da6b2b15..9168baa2 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsracqcc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsracqcc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -16,7 +16,7 @@ * Author: Joerg Riesmeier * * Purpose: - * classes: DSRAcquisitionContextConstraintChecker + * classes: DSRAcquisitionContextSRConstraintChecker * */ @@ -39,7 +39,7 @@ * (Preclinical Small Animal Image Acquisition Context) invoked at the root node. * Note: This IOD may be used with other Templates defined for Acquisition Context." */ -class DCMTK_DCMSR_EXPORT DSRAcquisitionContextConstraintChecker +class DCMTK_DCMSR_EXPORT DSRAcquisitionContextSRConstraintChecker : public DSRIODConstraintChecker { @@ -47,11 +47,11 @@ class DCMTK_DCMSR_EXPORT DSRAcquisitionContextConstraintChecker /** default constructor */ - DSRAcquisitionContextConstraintChecker(); + DSRAcquisitionContextSRConstraintChecker(); /** destructor */ - virtual ~DSRAcquisitionContextConstraintChecker(); + virtual ~DSRAcquisitionContextSRConstraintChecker(); /** check whether by-reference relationships are allowed for this SR IOD ** @return always returns OFFalse, i.e. by-reference relationships are not allowed diff --git a/dcmsr/include/dcmtk/dcmsr/dsrcodvl.h b/dcmsr/include/dcmtk/dcmsr/dsrcodvl.h index 362ed585..347e8e27 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrcodvl.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrcodvl.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -51,7 +51,7 @@ class DCMTK_DCMSR_EXPORT DSRBasicCodedEntry ** @param codeValue identifier of the code to be set that is unambiguous * within the coding scheme. (VR=SH/UC/UR, mandatory) * @param codingSchemeDesignator identifier of the coding scheme in which the code for - * a term is defined. (VR=SH, mandatory) + * a term is defined. (VR=SH, conditional) * @param codeMeaning human-readable translation of the 'codeValue'. Can be * used for display when code dictionary is not available. * (VR=LO, mandatory) @@ -71,7 +71,7 @@ class DCMTK_DCMSR_EXPORT DSRBasicCodedEntry ** @param codeValue identifier of the code to be set that is unambiguous * within the coding scheme. (VR=SH/UC/UR, mandatory) * @param codingSchemeDesignator identifier of the coding scheme in which the code for - * a term is defined. (VR=SH, mandatory) + * a term is defined. (VR=SH, conditional) * @param codingSchemeVersion version of the coding scheme. May be used to identify * the version of a coding scheme if necessary to resolve * ambiguity in the 'codeValue' or 'codeMeaning'. (VR=SH, @@ -96,7 +96,7 @@ class DCMTK_DCMSR_EXPORT DSRBasicCodedEntry const DSRTypes::E_CodeValueType CodeValueType; /// Code Value (VR=SH/UC/UR, type 1) const OFString CodeValue; - /// Coding Scheme Designator (VR=SH, type 1) + /// Coding Scheme Designator (VR=SH, type 1C) const OFString CodingSchemeDesignator; /// Coding Scheme Version (VR=SH, type 1C) const OFString CodingSchemeVersion; @@ -135,7 +135,7 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue ** @param codeValue identifier of the code to be set that is unambiguous * within the coding scheme. (VR=SH/UC/UR, mandatory) * @param codingSchemeDesignator identifier of the coding scheme in which the code for - * a term is defined. (VR=SH, mandatory) + * a term is defined. (VR=SH, conditional) * @param codeMeaning human-readable translation of the 'codeValue'. Can be * used for display when code dictionary is not available. * (VR=LO, mandatory) @@ -159,7 +159,7 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue ** @param codeValue identifier of the code to be set that is unambiguous * within the coding scheme. (VR=SH/UC/UR, mandatory) * @param codingSchemeDesignator identifier of the coding scheme in which the code for - * a term is defined. (VR=SH, mandatory) + * a term is defined. (VR=SH, conditional) * @param codingSchemeVersion version of the coding scheme. May be used to identify * the version of a coding scheme if necessary to resolve * ambiguity in the 'codeValue' or 'codeMeaning'. (VR=SH, @@ -249,10 +249,10 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue */ virtual OFBool isEmpty() const; - /** check whether the current code is complete, i.e.\ whether the three mandatory - * components of the code are non-empty. This is just a basic check that might be useful - * for "validating" input data. See isValid() for a more sophisticated way of checking - * the current code. + /** check whether the current code is complete, i.e.\ whether the three (two for URN code + * value) mandatory components of the code are non-empty. This is just a basic check + * that might be useful for "validating" input data. See isValid() for a more + * sophisticated way of checking the current code. ** @return OFTrue if code is complete, OFFalse otherwise */ virtual OFBool isComplete() const; @@ -320,7 +320,7 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue ** @return status, EC_Normal if successful, an error code otherwise */ OFCondition writeSequenceItem(DcmItem &item, - const DcmTagKey &tagKey); + const DcmTagKey &tagKey) const; /** read code from XML document. * Please note that only the "Basic Coded Entry Attributes" are supported by this method. @@ -517,7 +517,7 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue ** @param codeValue identifier of the code to be set that is unambiguous * within the coding scheme. (VR=SH/UC/UR, mandatory) * @param codingSchemeDesignator identifier of the coding scheme in which the code for - * a term is defined. (VR=SH, mandatory) + * a term is defined. (VR=SH, conditional) * Designators beginning with "99" and the designator * "L" are defined to be private or local coding schemes. * @param codeMeaning human-readable translation of the 'codeValue'. Can be @@ -549,7 +549,7 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue ** @param codeValue identifier of the code to be set that is unambiguous * within the coding scheme. (VR=SH, mandatory) * @param codingSchemeDesignator identifier of the coding scheme in which the code for - * a term is defined. (VR=SH, mandatory) + * a term is defined. (VR=SH, conditional) * Designators beginning with "99" and the designator * "L" are defined to be private or local coding schemes. * @param codingSchemeVersion version of the coding scheme. May be used to identify @@ -669,9 +669,10 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue // --- static helper functions --- /** check the specified code for validity. - * Currently, the only checks performed are that the three mandatory string values are - * non-empty and that all four values conform to the corresponding VR and VM. Later on, - * it might also be checked whether the specified code really belongs to the coding + * Currently, the only checks performed are that the three (two for URN code value) + * mandatory string values are non-empty and that all four values conform to the + * corresponding VR and VM. Later on, it might also be checked whether the specified + * code really belongs to the coding * scheme, etc. This requires the presence of the relevant code dictionaries, though. ** @param codeValue code value to be checked * @param codingSchemeDesignator coding scheme designator to be checked @@ -691,7 +692,7 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue * Please note that the check that is currently performed is very simple. So, the user * is advised to passed the correct type (short, long or URN) to the appropriate method * and should not rely on this automatic detection. Specifically, URN values are only - * detected by the prefix "urn:" (i.e. no URL allowed), and the maximum length of a + * detected by the prefix "urn:" or by the substring "://". The maximum length of a * short code value is determined based on the number of bytes (not characters, since * the character set is unknown to this function - and to this class). ** @param codeValue code value to be checked @@ -708,7 +709,7 @@ class DCMTK_DCMSR_EXPORT DSRCodedEntryValue DSRTypes::E_CodeValueType CodeValueType; /// Code Value (VR=SH/UC/UR, type 1) OFString CodeValue; - /// Coding Scheme Designator (VR=SH, type 1) + /// Coding Scheme Designator (VR=SH, type 1C) OFString CodingSchemeDesignator; /// Coding Scheme Version (VR=SH, type 1C) OFString CodingSchemeVersion; diff --git a/dcmsr/include/dcmtk/dcmsr/dsrdoc.h b/dcmsr/include/dcmtk/dcmsr/dsrdoc.h index 63542778..b61fc6cb 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrdoc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrdoc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2017, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -579,7 +579,7 @@ class DCMTK_DCMSR_EXPORT DSRDocument virtual OFCondition getDeviceSerialNumber(OFString &value, const signed long pos = 0) const; - /** get software version(s). Please note that only the first component is returned. + /** get software version(s) ** @param value reference to variable in which the value should be stored * @param pos index of the value to get (0..vm-1), -1 for all components ** @return status, EC_Normal if successful, an error code otherwise @@ -587,6 +587,30 @@ class DCMTK_DCMSR_EXPORT DSRDocument virtual OFCondition getSoftwareVersions(OFString &value, const signed long pos = 0) const; + /** get synchronization frame of reference UID + ** @param value reference to variable in which the value should be stored + * @param pos index of the value to get (0..vm-1), -1 for all components + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getSynchronizationFrameOfReferenceUID(OFString &value, + const signed long pos = 0) const; + + /** get synchronization trigger + ** @param value reference to variable in which the value should be stored + * @param pos index of the value to get (0..vm-1), -1 for all components + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getSynchronizationTrigger(OFString &value, + const signed long pos = 0) const; + + /** get acquisition time synchronized + ** @param value reference to variable in which the value should be stored + * @param pos index of the value to get (0..vm-1), -1 for all components + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getAcquisitionTimeSynchronized(OFString &value, + const signed long pos = 0) const; + /** get study date ** @param value reference to variable in which the value should be stored * @param pos index of the value to get (0..vm-1), -1 for all components @@ -667,6 +691,14 @@ class DCMTK_DCMSR_EXPORT DSRDocument virtual OFCondition getPatientID(OFString &value, const signed long pos = 0) const; + /** get issuer of patient ID + ** @param value reference to variable in which the value should be stored + * @param pos index of the value to get (0..vm-1), -1 for all components + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getIssuerOfPatientID(OFString &value, + const signed long pos = 0) const; + /** get series number ** @param value reference to variable in which the value should be stored * @param pos index of the value to get (0..vm-1), -1 for all components @@ -815,6 +847,29 @@ class DCMTK_DCMSR_EXPORT DSRDocument virtual OFCondition setSoftwareVersions(const OFString &value, const OFBool check = OFTrue); + /** set synchronization frame of reference UID + ** @param value value to be set (single value only) or "" for no value + * @param check check 'value' for conformance with VR (UI) and VM (1) if enabled + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition setSynchronizationFrameOfReferenceUID(const OFString &value, + const OFBool check = OFTrue); + /** set synchronization trigger + ** @param value value to be set (single value only) or "" for no value + * @param check check 'value' for conformance with VR (CS) and VM (1) if enabled + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition setSynchronizationTrigger(const OFString &value, + const OFBool check = OFTrue); + + /** set acquisition time synchronized + ** @param value value to be set (single value only) or "" for no value + * @param check check 'value' for conformance with VR (CS) and VM (1) if enabled + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition setAcquisitionTimeSynchronized(const OFString &value, + const OFBool check = OFTrue); + /** set content date ** @param value value to be set (single value only). If an empty string is passed, * the current date is set when displaying or writing the document since @@ -883,6 +938,14 @@ class DCMTK_DCMSR_EXPORT DSRDocument virtual OFCondition setPatientID(const OFString &value, const OFBool check = OFTrue); + /** set issuer of patient ID + ** @param value value to be set (single value only) or "" for no value + * @param check check 'value' for conformance with VR (LO) and VM (1) if enabled + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition setIssuerOfPatientID(const OFString &value, + const OFBool check = OFTrue); + /** set series number ** @param value value to be set (single value only). If an empty string is passed, * the value "1" is set when displaying or writing the document since @@ -1291,6 +1354,8 @@ class DCMTK_DCMSR_EXPORT DSRDocument DcmPersonName PatientName; /// Patient ID: (LO, 1, 2) DcmLongString PatientID; + /// Issuer of Patient ID: (LO, 1, 3) + DcmLongString IssuerOfPatientID; /// Patient's Birth Date: (DA, 1, 2) DcmDate PatientBirthDate; /// Patient's Sex: (CS, 1, 2) @@ -1318,9 +1383,14 @@ class DCMTK_DCMSR_EXPORT DSRDocument // Software Version(s): (LO, 1-n, 1) // - see 'General Equipment Module' - // --- Synchronization Module (C/U - for some IODs) --- + // --- Synchronization Module (M/C/U - for some IODs) --- - // tbd: conditional/optional module not yet supported + /// Synchronization Frame of Reference UID: (UI, 1, 1) + DcmUniqueIdentifier SynchronizationFrameOfReferenceUID; + /// Synchronization Trigger: (CS, 1, 1) + DcmCodeString SynchronizationTrigger; + /// Acquisition Time Synchronized: (CS, 1, 1) + DcmCodeString AcquisitionTimeSynchronized; // --- SR Document Series / Key Object Document Series Module (M) --- diff --git a/dcmsr/include/dcmtk/dcmsr/dsrdocst.h b/dcmsr/include/dcmtk/dcmsr/dsrdocst.h index 14c03bfc..4d321a17 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrdocst.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrdocst.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -782,8 +782,19 @@ class DCMTK_DCMSR_EXPORT DSRDocumentSubTree virtual OFCondition checkSubTreeConstraints(const DSRDocumentSubTree *tree, const DSRIODConstraintChecker *checker) const; + // --- static helper function --- + /** check whether a by-reference relationship from a given source to a target node + * (specified by the position strings) is valid, i.e.\ is allowed according to the + * DICOM standard. This check should prevent loops (directed acyclic graphs). + ** @param sourcePosition position string of the source content item to be checked + * @param targetPosition position string of the target content item to be checked + ** @return OFTrue if by-reference relationship is allowed, OFFalse otherwise + */ + virtual OFBool validByReferenceRelationship(const OFString &sourcePosition, + const OFString &targetPosition); + /** clone a particular subtree, i.e.\ a fragment of a tree ** @param startCursor cursor pointing to first node of the subtree to be copied * @param stopAfterNodeID ID of the node after which the cloning should stop diff --git a/dcmsr/include/dcmtk/dcmsr/dsrpficc.h b/dcmsr/include/dcmtk/dcmsr/dsrpficc.h new file mode 100644 index 00000000..7c648dd3 --- /dev/null +++ b/dcmsr/include/dcmtk/dcmsr/dsrpficc.h @@ -0,0 +1,94 @@ +/* + * + * Copyright (C) 2019, J. Riesmeier, Oldenburg, Germany + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation are maintained by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmsr + * + * Author: Joerg Riesmeier + * + * Purpose: + * classes: DSRPerformedImagingAgentAdministrationSRConstraintChecker + * + */ + + +#ifndef DSRPFICC_H +#define DSRPFICC_H + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmsr/dsriodcc.h" + + +/*---------------------* + * class declaration * + *---------------------*/ + +/** Class for checking the relationship content constraints of the Performed Imaging Agent + * Administration SR IOD. + * According to DICOM PS 3.3: "The document shall be constructed from TID 11020 + * (Performed Imaging Agent Administration) invoked at the root node." + */ +class DCMTK_DCMSR_EXPORT DSRPerformedImagingAgentAdministrationSRConstraintChecker + : public DSRIODConstraintChecker +{ + + public: + + /** default constructor + */ + DSRPerformedImagingAgentAdministrationSRConstraintChecker(); + + /** destructor + */ + virtual ~DSRPerformedImagingAgentAdministrationSRConstraintChecker(); + + /** check whether by-reference relationships are allowed for this SR IOD + ** @return always returns OFFalse, i.e. by-reference relationships are not allowed + */ + virtual OFBool isByReferenceAllowed() const; + + /** check whether this SR IOD requires template support + ** @return always returns OFTrue, i.e. template support is required + */ + virtual OFBool isTemplateSupportRequired() const; + + /** get identifier and mapping resource of the root template (if any) + ** @param templateIdentifier identifier of the root template (might be empty) + * @param mappingResource mapping resource that defines the root template + * (might be empty) + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, + OFString &mappingResource) const; + + /** get the associated document type of the SR IOD + ** @return document type (DSRTypes::DT_PerformedImagingAgentAdministrationSR) + */ + virtual E_DocumentType getDocumentType() const; + + /** check whether specified content relationship is allowed for this IOD + ** @param sourceValueType value type of the source content item to be checked + * @param relationshipType type of relationship between source and target item + * @param targetValueType value type of the target content item to be checked + * @param byReference optional flag indicating whether the node/relationship + * should be added by-value (default) or by-reference + ** @return OFTrue if content relationship is allowed, OFFalse otherwise + */ + virtual OFBool checkContentRelationship(const E_ValueType sourceValueType, + const E_RelationshipType relationshipType, + const E_ValueType targetValueType, + const OFBool byReference = OFFalse) const; +}; + + +#endif diff --git a/dcmsr/include/dcmtk/dcmsr/dsrplicc.h b/dcmsr/include/dcmtk/dcmsr/dsrplicc.h new file mode 100644 index 00000000..716a2b72 --- /dev/null +++ b/dcmsr/include/dcmtk/dcmsr/dsrplicc.h @@ -0,0 +1,94 @@ +/* + * + * Copyright (C) 2019, J. Riesmeier, Oldenburg, Germany + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation are maintained by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmsr + * + * Author: Joerg Riesmeier + * + * Purpose: + * classes: DSRPlannedImagingAgentAdministrationSRConstraintChecker + * + */ + + +#ifndef DSRPLICC_H +#define DSRPLICC_H + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmsr/dsriodcc.h" + + +/*---------------------* + * class declaration * + *---------------------*/ + +/** Class for checking the relationship content constraints of the Planned Imaging Agent + * Administration SR IOD. + * According to DICOM PS 3.3: "The document shall be constructed from TID 11001 + * (Planned Imaging Agent Administration) invoked at the root node." + */ +class DCMTK_DCMSR_EXPORT DSRPlannedImagingAgentAdministrationSRConstraintChecker + : public DSRIODConstraintChecker +{ + + public: + + /** default constructor + */ + DSRPlannedImagingAgentAdministrationSRConstraintChecker(); + + /** destructor + */ + virtual ~DSRPlannedImagingAgentAdministrationSRConstraintChecker(); + + /** check whether by-reference relationships are allowed for this SR IOD + ** @return always returns OFFalse, i.e. by-reference relationships are not allowed + */ + virtual OFBool isByReferenceAllowed() const; + + /** check whether this SR IOD requires template support + ** @return always returns OFTrue, i.e. template support is required + */ + virtual OFBool isTemplateSupportRequired() const; + + /** get identifier and mapping resource of the root template (if any) + ** @param templateIdentifier identifier of the root template (might be empty) + * @param mappingResource mapping resource that defines the root template + * (might be empty) + ** @return status, EC_Normal if successful, an error code otherwise + */ + virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, + OFString &mappingResource) const; + + /** get the associated document type of the SR IOD + ** @return document type (DSRTypes::DT_PlannedImagingAgentAdministrationSR) + */ + virtual E_DocumentType getDocumentType() const; + + /** check whether specified content relationship is allowed for this IOD + ** @param sourceValueType value type of the source content item to be checked + * @param relationshipType type of relationship between source and target item + * @param targetValueType value type of the target content item to be checked + * @param byReference optional flag indicating whether the node/relationship + * should be added by-value (default) or by-reference + ** @return OFTrue if content relationship is allowed, OFFalse otherwise + */ + virtual OFBool checkContentRelationship(const E_ValueType sourceValueType, + const E_RelationshipType relationshipType, + const E_ValueType targetValueType, + const OFBool byReference = OFFalse) const; +}; + + +#endif diff --git a/dcmsr/include/dcmtk/dcmsr/dsrrrdcc.h b/dcmsr/include/dcmtk/dcmsr/dsrrrdcc.h index 9fa55d67..c9ea5cbb 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrrrdcc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrrrdcc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2014-2015, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2014-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -16,7 +16,7 @@ * Author: Joerg Riesmeier * * Purpose: - * classes: DSRRadiopharmaceuticalRadiationDoseConstraintChecker + * classes: DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker * */ @@ -38,7 +38,7 @@ * According to DICOM PS 3.3: "The document may be constructed from Baseline TID 10021 * (Radiopharmaceutical Radiation Dose) invoked at the root node." */ -class DCMTK_DCMSR_EXPORT DSRRadiopharmaceuticalRadiationDoseConstraintChecker +class DCMTK_DCMSR_EXPORT DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker : public DSRIODConstraintChecker { @@ -46,11 +46,11 @@ class DCMTK_DCMSR_EXPORT DSRRadiopharmaceuticalRadiationDoseConstraintChecker /** default constructor */ - DSRRadiopharmaceuticalRadiationDoseConstraintChecker(); + DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker(); /** destructor */ - virtual ~DSRRadiopharmaceuticalRadiationDoseConstraintChecker(); + virtual ~DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker(); /** check whether by-reference relationships are allowed for this SR IOD ** @return always returns OFFalse, i.e. by-reference relationships are not allowed diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtypes.h b/dcmsr/include/dcmtk/dcmsr/dsrtypes.h index 54282b3e..d3915ac9 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrtypes.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrtypes.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2017, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -455,6 +455,9 @@ class DCMTK_DCMSR_EXPORT DSRTypes /// do not count internal "included template" nodes (only with PF_hideIncludedTemplateNodes) static const size_t PF_dontCountIncludedTemplateNodes; + /// print text "empty code" for empty codes (instead of "invalid code") + static const size_t PF_printEmptyCodes; + /// shortcut: print all codes (combines all PF_printXxxCodes flags, see above) static const size_t PF_printAllCodes; //@} @@ -536,8 +539,12 @@ class DCMTK_DCMSR_EXPORT DSRTypes DT_SimplifiedAdultEchoSR, /// DICOM IOD: Patient Radiation Dose SR DT_PatientRadiationDoseSR, + /// DICOM IOD: Performed Imaging Agent Administration SR + DT_PerformedImagingAgentAdministrationSR, + /// DICOM IOD: Planned Imaging Agent Administration SR + DT_PlannedImagingAgentAdministrationSR, /// internal type used to mark the last entry - DT_last = DT_PatientRadiationDoseSR + DT_last = DT_PlannedImagingAgentAdministrationSR }; /** SR relationship types @@ -898,6 +905,12 @@ class DCMTK_DCMSR_EXPORT DSRTypes */ static OFBool requiresTimezoneModule(const E_DocumentType documentType); + /** check whether SR document type requires Synchronization Module + ** @param documentType SR document type to be checked + ** @return OFTrue if Synchronization Module is required, OFFalse otherwise + */ + static OFBool requiresSynchronizationModule(const E_DocumentType documentType); + /** convert relationship type to DICOM defined term ** @param relationshipType relationship type to be converted ** @return defined term if type is valid, empty string otherwise (never NULL) diff --git a/dcmsr/include/dcmtk/dcmsr/dsrxmlc.h b/dcmsr/include/dcmtk/dcmsr/dsrxmlc.h index 71b0f08c..f2a2a1cb 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrxmlc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrxmlc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2016, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -35,6 +35,26 @@ #include "dcmtk/ofstd/ofstdinc.h" #ifdef WITH_LIBXML + +#ifdef __ibmxl__ +// IBM xlC defines __GNUC__ but does not support the GNUC extension +// __attribute__ ((format (printf, 2, 3))). +// This avoids a compiler warning in . +#define LIBXML_ATTR_FORMAT(fmt,args) +#endif + +// The libxml library also uses unicode. So we have to reuse some +// workarounds for the ICU library here as well. +// The type char16_t is only supported since C++11. +#ifndef HAVE_CHAR16_T +#define UCHAR_TYPE uint16_t +#endif + +//If U_NOEXCEPT is not defined, ICU falls back to NOEXCEPT. +#ifndef HAVE_CXX11 +#define U_NOEXCEPT +#endif + #include #endif diff --git a/dcmsr/include/dcmtk/dcmsr/dsrxmld.h b/dcmsr/include/dcmtk/dcmsr/dsrxmld.h index 29ddb4cc..5b0880b5 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrxmld.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrxmld.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2016, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -103,7 +103,9 @@ class DCMTK_DCMSR_EXPORT DSRXMLDocument */ OFBool encodingHandlerValid() const; - /** set the specified character encoding handler. + /** set character encoding handler for converting internally stored character strings + * (UTF-8) to a particular character set. This conversion is only done when requested, + * e.g. when calling getStringFromAttribute() with the 'encoding' parameter being OFTrue. * NB: 'libxml' relies on GNU 'libiconv' for most character sets. ** @param charset XML name of the character set (e.g. "ISO-8859-1" for ISO Latin-1) ** @return status, EC_Normal if successful, an error code otherwise @@ -131,6 +133,19 @@ class DCMTK_DCMSR_EXPORT DSRXMLDocument const char *name, const OFBool required = OFTrue) const; + /** get a particular named child node of the document. + * Please note that the search process is limited to the first level below the current + * one, i.e. no deep search is performed. + ** @param cursor cursor pointing to the parent of the node where to start from + * @param name name of the node (XML element) to be searched for + * @param required flag specifying whether the node is required or not. If the node + * is required to be present an error message is reported. + ** @return cursor pointing to the named node if successful, invalid cursor otherwise + */ + DSRXMLCursor getNamedChildNode(const DSRXMLCursor &cursor, + const char *name, + const OFBool required = OFTrue) const; + /** check whether particular node matches a given name ** @param cursor cursor pointing to the particular node * @param name name of the node (XML element) to be checked diff --git a/dcmsr/libcmr/Makefile.dep b/dcmsr/libcmr/Makefile.dep index 8747cee3..60123a94 100644 --- a/dcmsr/libcmr/Makefile.dep +++ b/dcmsr/libcmr/Makefile.dep @@ -43,25 +43,21 @@ cid100.o: cid100.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid10013.o: cid10013.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -109,25 +105,21 @@ cid10013.o: cid10013.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid10013e.o: cid10013e.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -176,25 +168,21 @@ cid10013e.o: cid10013e.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid10033.o: cid10033.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -242,25 +230,21 @@ cid10033.o: cid10033.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid10033e.o: cid10033e.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -309,25 +293,21 @@ cid10033e.o: cid10033e.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid11.o: cid11.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -375,25 +355,21 @@ cid11.o: cid11.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid244.o: cid244.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -441,25 +417,21 @@ cid244.o: cid244.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid244e.o: cid244e.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -507,25 +479,21 @@ cid244e.o: cid244e.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid29.o: cid29.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -573,25 +541,21 @@ cid29.o: cid29.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid29e.o: cid29e.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -639,25 +603,21 @@ cid29e.o: cid29e.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmsr/codes/dcm.h @@ -706,25 +666,21 @@ cid4020.o: cid4020.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid4021.o: cid4021.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -772,25 +728,21 @@ cid4021.o: cid4021.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid4031.o: cid4031.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -838,25 +790,21 @@ cid4031.o: cid4031.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid4031e.o: cid4031e.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -905,25 +853,21 @@ cid4031e.o: cid4031e.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid42.o: cid42.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -971,25 +915,21 @@ cid42.o: cid42.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid5000.o: cid5000.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1037,25 +977,21 @@ cid5000.o: cid5000.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid5001.o: cid5001.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1103,25 +1039,21 @@ cid5001.o: cid5001.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid6147.o: cid6147.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1169,25 +1101,21 @@ cid6147.o: cid6147.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid7021.o: cid7021.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1233,27 +1161,23 @@ cid7021.o: cid7021.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ ../../oflog/include/dcmtk/oflog/spi/logfact.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ - ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ - ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid7181.o: cid7181.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1301,25 +1225,21 @@ cid7181.o: cid7181.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid7445.o: cid7445.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1367,25 +1287,21 @@ cid7445.o: cid7445.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid7452.o: cid7452.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1433,25 +1349,21 @@ cid7452.o: cid7452.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid7453.o: cid7453.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1499,25 +1411,21 @@ cid7453.o: cid7453.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid7464.o: cid7464.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1565,25 +1473,21 @@ cid7464.o: cid7464.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h cid7469.o: cid7469.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1631,25 +1535,21 @@ cid7469.o: cid7469.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/cmr/define.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h init.o: init.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -1698,25 +1598,21 @@ init.o: init.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../ofstd/include/dcmtk/ofstd/ofmap.h \ ../include/dcmtk/dcmsr/cmr/cid29.h ../include/dcmtk/dcmsr/cmr/cid42.h \ ../include/dcmtk/dcmsr/cmr/cid100.h ../include/dcmtk/dcmsr/cmr/cid244.h \ @@ -1769,19 +1665,6 @@ logger.o: logger.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../include/dcmtk/dcmsr/cmr/define.h srnumvl.o: srnumvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/cmr/srnumvl.h ../include/dcmtk/dcmsr/dsrnumvl.h \ @@ -1828,25 +1711,21 @@ srnumvl.o: srnumvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \ @@ -1899,22 +1778,17 @@ tid1001.o: tid1001.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1922,6 +1796,7 @@ tid1001.o: tid1001.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -1991,22 +1866,17 @@ tid1204.o: tid1204.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2014,6 +1884,7 @@ tid1204.o: tid1204.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -2082,22 +1953,17 @@ tid1411.o: tid1411.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2105,6 +1971,7 @@ tid1411.o: tid1411.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -2136,7 +2003,7 @@ tid1411.o: tid1411.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/cmr/cid7469.h \ ../include/dcmtk/dcmsr/cmr/tid15def.h \ ../include/dcmtk/dcmsr/cmr/logger.h ../include/dcmtk/dcmsr/codes/dcm.h \ - ../include/dcmtk/dcmsr/codes/ncit.h ../include/dcmtk/dcmsr/codes/srt.h \ + ../include/dcmtk/dcmsr/codes/ncit.h ../include/dcmtk/dcmsr/codes/sct.h \ ../include/dcmtk/dcmsr/codes/umls.h ../include/dcmtk/dcmsr/dsrtpltn.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h @@ -2186,22 +2053,17 @@ tid1419m.o: tid1419m.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2209,6 +2071,7 @@ tid1419m.o: tid1419m.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -2238,7 +2101,7 @@ tid1419m.o: tid1419m.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/cmr/cid7181.h \ ../include/dcmtk/dcmsr/cmr/cid7464.h \ ../include/dcmtk/dcmsr/cmr/cid7469.h ../include/dcmtk/dcmsr/cmr/logger.h \ - ../include/dcmtk/dcmsr/codes/dcm.h ../include/dcmtk/dcmsr/codes/srt.h \ + ../include/dcmtk/dcmsr/codes/dcm.h ../include/dcmtk/dcmsr/codes/sct.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h tid1500.o: tid1500.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2287,22 +2150,17 @@ tid1500.o: tid1500.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2310,6 +2168,7 @@ tid1500.o: tid1500.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -2401,22 +2260,17 @@ tid1501.o: tid1501.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2424,6 +2278,7 @@ tid1501.o: tid1501.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -2453,7 +2308,7 @@ tid1501.o: tid1501.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/cmr/cid7469.h \ ../include/dcmtk/dcmsr/cmr/tid15def.h \ ../include/dcmtk/dcmsr/cmr/logger.h ../include/dcmtk/dcmsr/codes/dcm.h \ - ../include/dcmtk/dcmsr/codes/ncit.h ../include/dcmtk/dcmsr/codes/srt.h \ + ../include/dcmtk/dcmsr/codes/ncit.h ../include/dcmtk/dcmsr/codes/sct.h \ ../include/dcmtk/dcmsr/codes/umls.h ../include/dcmtk/dcmsr/dsrtpltn.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h tid15def.o: tid15def.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2515,22 +2370,17 @@ tid1600.o: tid1600.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2538,6 +2388,7 @@ tid1600.o: tid1600.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -2569,7 +2420,7 @@ tid1600.o: tid1600.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/cmr/cid10033e.h \ ../include/dcmtk/dcmsr/cmr/cid10033.h \ ../include/dcmtk/dcmsr/cmr/logger.h ../include/dcmtk/dcmsr/codes/dcm.h \ - ../include/dcmtk/dcmsr/codes/srt.h ../include/dcmtk/dcmsr/codes/ucum.h \ + ../include/dcmtk/dcmsr/codes/sct.h ../include/dcmtk/dcmsr/codes/ucum.h \ ../include/dcmtk/dcmsr/dsrdattn.h ../include/dcmtk/dcmsr/dsrstrvl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h @@ -2619,22 +2470,17 @@ tid300.o: tid300.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2642,6 +2488,7 @@ tid300.o: tid300.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -2670,7 +2517,7 @@ tid300.o: tid300.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/cmr/cid7181.h \ ../include/dcmtk/dcmsr/cmr/cid7464.h \ ../include/dcmtk/dcmsr/cmr/cid7469.h ../include/dcmtk/dcmsr/cmr/logger.h \ - ../include/dcmtk/dcmsr/codes/dcm.h ../include/dcmtk/dcmsr/codes/srt.h \ + ../include/dcmtk/dcmsr/codes/dcm.h ../include/dcmtk/dcmsr/codes/sct.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h tid4019.o: tid4019.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -2719,22 +2566,17 @@ tid4019.o: tid4019.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2742,6 +2584,7 @@ tid4019.o: tid4019.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ diff --git a/dcmsr/libcmr/cid100.cc b/dcmsr/libcmr/cid100.cc index 6e58a1c7..b9016c9f 100644 --- a/dcmsr/libcmr/cid100.cc +++ b/dcmsr/libcmr/cid100.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID100_QuantitativeDiagnosticImagingProcedures * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:12 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:14 by J. Riesmeier * */ @@ -18,7 +18,7 @@ // general information on CID 100 (Quantitative Diagnostic Imaging Procedures) #define CONTEXT_GROUP_NUMBER "100" -#define CONTEXT_GROUP_VERSION "20141110" +#define CONTEXT_GROUP_VERSION "20190121" #define CONTEXT_GROUP_UID "1.2.840.10008.6.1.998" #define CONTEXT_GROUP_TYPE OFTrue /* extensible */ @@ -149,17 +149,22 @@ CID100_QuantitativeDiagnosticImagingProcedures::CodeList &CID100_QuantitativeDia /* create a new code list (should never fail) */ Codes = new CodeList(); /* and initialize it by adding the coded entries */ - Codes->insert(OFMake_pair(MagneticResonanceImagingGuidance, DSRBasicCodedEntry("P5-09051", "SRT", "Magnetic resonance imaging guidance"))); + Codes->insert(OFMake_pair(ImagingProcedure, DSRBasicCodedEntry("363679005", "SCT", "Imaging procedure"))); + Codes->insert(OFMake_pair(MagneticResonanceImagingGuidance, DSRBasicCodedEntry("258177008", "SCT", "Magnetic resonance imaging guidance"))); Codes->insert(OFMake_pair(MultiparametricMRI, DSRBasicCodedEntry("126020", "DCM", "Multiparametric MRI"))); Codes->insert(OFMake_pair(MultiparametricMRIOfProstate, DSRBasicCodedEntry("126021", "DCM", "Multiparametric MRI of prostate"))); Codes->insert(OFMake_pair(MultiparametricMRIOfWholeBody, DSRBasicCodedEntry("126022", "DCM", "Multiparametric MRI of whole body"))); - Codes->insert(OFMake_pair(DynamicMagneticResonanceImagingOfKnee, DSRBasicCodedEntry("P5-0907F", "SRT", "Dynamic magnetic resonance imaging of knee"))); - Codes->insert(OFMake_pair(DynamicMagneticResonanceImagingOfPelvis, DSRBasicCodedEntry("P5-70694", "SRT", "Dynamic magnetic resonance imaging of pelvis"))); + Codes->insert(OFMake_pair(DynamicMagneticResonanceImagingOfKnee, DSRBasicCodedEntry("433139009", "SCT", "Dynamic magnetic resonance imaging of knee"))); + Codes->insert(OFMake_pair(DynamicMagneticResonanceImagingOfPelvis, DSRBasicCodedEntry("446315002", "SCT", "Dynamic magnetic resonance imaging of pelvis"))); + Codes->insert(OFMake_pair(CTUnspecifiedBodyRegion, DSRBasicCodedEntry("25045-6", "LN", "CT unspecified body region"))); + Codes->insert(OFMake_pair(MRIUnspecifiedBodyRegion, DSRBasicCodedEntry("25056-3", "LN", "MRI unspecified body region"))); + Codes->insert(OFMake_pair(NMUnspecifiedBodyRegion, DSRBasicCodedEntry("49118-3", "LN", "NM unspecified body region"))); + Codes->insert(OFMake_pair(PETUnspecifiedBodyRegion, DSRBasicCodedEntry("44136-0", "LN", "PET unspecified body region"))); Codes->insert(OFMake_pair(PETWholeBody, DSRBasicCodedEntry("44139-4", "LN", "PET whole body"))); - Codes->insert(OFMake_pair(PETCT_FDGImagingOfWholeBody, DSRBasicCodedEntry("P5-080FF", "SRT", "PET/CT FDG imaging of whole body"))); - Codes->insert(OFMake_pair(PETCT_METImagingOfWholeBody, DSRBasicCodedEntry("P5-08118", "SRT", "PET/CT MET imaging of whole body"))); - Codes->insert(OFMake_pair(CTHeadPerfusionWithIVContrast, DSRBasicCodedEntry("RPID96", "RADLEX", "CT head perfusion with IV contrast"))); - Codes->insert(OFMake_pair(NMHeadPerfusionBrainSPECT, DSRBasicCodedEntry("RPID5258", "RADLEX", "NM head perfusion brain SPECT"))); + Codes->insert(OFMake_pair(PETCT_FDGImagingOfWholeBody, DSRBasicCodedEntry("443271005", "SCT", "PET/CT FDG imaging of whole body"))); + Codes->insert(OFMake_pair(PETCT_METImagingOfWholeBody, DSRBasicCodedEntry("443844003", "SCT", "PET/CT MET imaging of whole body"))); + Codes->insert(OFMake_pair(CTPerfusionHeadWithContrastIV, DSRBasicCodedEntry("39142-5", "LN", "CT perfusion head with contrast IV"))); + Codes->insert(OFMake_pair(SPECTBrain, DSRBasicCodedEntry("39632-5", "LN", "SPECT brain"))); Codes->insert(OFMake_pair(NMHeadPerfusionBrainPET_CT_AV45, DSRBasicCodedEntry("RPID5427", "RADLEX", "NM head perfusion brain PET-CT AV-45"))); } /* should never be NULL */ diff --git a/dcmsr/libcmr/cid10013.cc b/dcmsr/libcmr/cid10013.cc index 56a814a4..30ff20cb 100644 --- a/dcmsr/libcmr/cid10013.cc +++ b/dcmsr/libcmr/cid10013.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID10013_CTAcquisitionType * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:35 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:39 by J. Riesmeier * */ @@ -150,11 +150,11 @@ CID10013_CTAcquisitionType::CodeList &CID10013_CTAcquisitionType::getCodes() Codes = new CodeList(); /* and initialize it by adding the coded entries */ Codes->insert(OFMake_pair(SequencedAcquisition, DSRBasicCodedEntry("113804", "DCM", "Sequenced Acquisition"))); - Codes->insert(OFMake_pair(SpiralAcquisition, DSRBasicCodedEntry("P5-08001", "SRT", "Spiral Acquisition"))); + Codes->insert(OFMake_pair(SpiralAcquisition, DSRBasicCodedEntry("116152004", "SCT", "Spiral Acquisition"))); Codes->insert(OFMake_pair(ConstantAngleAcquisition, DSRBasicCodedEntry("113805", "DCM", "Constant Angle Acquisition"))); Codes->insert(OFMake_pair(StationaryAcquisition, DSRBasicCodedEntry("113806", "DCM", "Stationary Acquisition"))); Codes->insert(OFMake_pair(FreeAcquisition, DSRBasicCodedEntry("113807", "DCM", "Free Acquisition"))); - Codes->insert(OFMake_pair(ConeBeamAcquisition, DSRBasicCodedEntry("R-FB8F1", "SRT", "Cone Beam Acquisition"))); + Codes->insert(OFMake_pair(ConeBeamAcquisition, DSRBasicCodedEntry("702569007", "SCT", "Cone Beam Acquisition"))); } /* should never be NULL */ return *Codes; diff --git a/dcmsr/libcmr/cid10033.cc b/dcmsr/libcmr/cid10033.cc index 5f611b6a..1839856f 100644 --- a/dcmsr/libcmr/cid10033.cc +++ b/dcmsr/libcmr/cid10033.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID10033_CTReconstructionAlgorithm * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:37 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:41 by J. Riesmeier * */ diff --git a/dcmsr/libcmr/cid11.cc b/dcmsr/libcmr/cid11.cc index e42a5789..26280725 100644 --- a/dcmsr/libcmr/cid11.cc +++ b/dcmsr/libcmr/cid11.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID11_RouteOfAdministration * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:07 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:09 by J. Riesmeier * */ @@ -149,31 +149,31 @@ CID11_RouteOfAdministration::CodeList &CID11_RouteOfAdministration::getCodes() /* create a new code list (should never fail) */ Codes = new CodeList(); /* and initialize it by adding the coded entries */ - Codes->insert(OFMake_pair(IntravenousRoute, DSRBasicCodedEntry("G-D101", "SRT", "Intravenous route"))); - Codes->insert(OFMake_pair(IntraArterialRoute, DSRBasicCodedEntry("G-D102", "SRT", "Intra-arterial route"))); - Codes->insert(OFMake_pair(IntramuscularRoute, DSRBasicCodedEntry("G-D103", "SRT", "Intramuscular route"))); - Codes->insert(OFMake_pair(SubcutaneousRoute, DSRBasicCodedEntry("G-D104", "SRT", "Subcutaneous route"))); - Codes->insert(OFMake_pair(IntracutaneousRoute, DSRBasicCodedEntry("G-D17D", "SRT", "Intracutaneous route"))); - Codes->insert(OFMake_pair(IntraperitonealRoute, DSRBasicCodedEntry("G-D106", "SRT", "Intraperitoneal route"))); - Codes->insert(OFMake_pair(IntramedullaryRoute, DSRBasicCodedEntry("G-D107", "SRT", "Intramedullary route"))); - Codes->insert(OFMake_pair(IntrathecalRoute, DSRBasicCodedEntry("G-D108", "SRT", "Intrathecal route"))); - Codes->insert(OFMake_pair(IntraArticularRoute, DSRBasicCodedEntry("G-D109", "SRT", "Intra-articular route"))); + Codes->insert(OFMake_pair(IntravenousRoute, DSRBasicCodedEntry("47625008", "SCT", "Intravenous route"))); + Codes->insert(OFMake_pair(IntraArterialRoute, DSRBasicCodedEntry("58100008", "SCT", "Intra-arterial route"))); + Codes->insert(OFMake_pair(IntramuscularRoute, DSRBasicCodedEntry("78421000", "SCT", "Intramuscular route"))); + Codes->insert(OFMake_pair(SubcutaneousRoute, DSRBasicCodedEntry("34206005", "SCT", "Subcutaneous route"))); + Codes->insert(OFMake_pair(IntracutaneousRoute, DSRBasicCodedEntry("372464004", "SCT", "Intracutaneous route"))); + Codes->insert(OFMake_pair(IntraperitonealRoute, DSRBasicCodedEntry("38239002", "SCT", "Intraperitoneal route"))); + Codes->insert(OFMake_pair(IntramedullaryRoute, DSRBasicCodedEntry("60213007", "SCT", "Intramedullary route"))); + Codes->insert(OFMake_pair(IntrathecalRoute, DSRBasicCodedEntry("72607000", "SCT", "Intrathecal route"))); + Codes->insert(OFMake_pair(IntraArticularRoute, DSRBasicCodedEntry("12130007", "SCT", "Intra-articular route"))); Codes->insert(OFMake_pair(IntraepithelialRoute, DSRBasicCodedEntry("C38244", "NCIt", "Intraepithelial route"))); - Codes->insert(OFMake_pair(TopicalRoute, DSRBasicCodedEntry("G-D112", "SRT", "Topical route"))); - Codes->insert(OFMake_pair(OralRoute, DSRBasicCodedEntry("G-D140", "SRT", "Oral route"))); + Codes->insert(OFMake_pair(TopicalRoute, DSRBasicCodedEntry("6064005", "SCT", "Topical route"))); + Codes->insert(OFMake_pair(OralRoute, DSRBasicCodedEntry("26643006", "SCT", "Oral route"))); Codes->insert(OFMake_pair(TransluminalRoute, DSRBasicCodedEntry("C38306", "NCIt", "Transluminal route"))); - Codes->insert(OFMake_pair(IntraluminalRoute, DSRBasicCodedEntry("G-D144", "SRT", "Intraluminal route"))); + Codes->insert(OFMake_pair(IntraluminalRoute, DSRBasicCodedEntry("37737002", "SCT", "Intraluminal route"))); Codes->insert(OFMake_pair(ExtraluminalRoute, DSRBasicCodedEntry("C38213", "NCIt", "Extraluminal route"))); - Codes->insert(OFMake_pair(ByInhalation, DSRBasicCodedEntry("R-40B32", "SRT", "By inhalation"))); - Codes->insert(OFMake_pair(PerRectum, DSRBasicCodedEntry("G-D160", "SRT", "Per rectum"))); - Codes->insert(OFMake_pair(VaginalRoute, DSRBasicCodedEntry("G-D164", "SRT", "Vaginal route"))); - Codes->insert(OFMake_pair(IntracoronaryRoute, DSRBasicCodedEntry("G-D17C", "SRT", "Intracoronary route"))); - Codes->insert(OFMake_pair(IntracardiacRoute, DSRBasicCodedEntry("G-D173", "SRT", "Intracardiac route"))); - Codes->insert(OFMake_pair(IntraventricularRouteCardiac, DSRBasicCodedEntry("R-F2C86", "SRT", "Intraventricular route - cardiac"))); + Codes->insert(OFMake_pair(ByInhalation, DSRBasicCodedEntry("446406008", "SCT", "By inhalation"))); + Codes->insert(OFMake_pair(PerRectum, DSRBasicCodedEntry("37161004", "SCT", "Per rectum"))); + Codes->insert(OFMake_pair(VaginalRoute, DSRBasicCodedEntry("16857009", "SCT", "Vaginal route"))); + Codes->insert(OFMake_pair(IntracoronaryRoute, DSRBasicCodedEntry("372463005", "SCT", "Intracoronary route"))); + Codes->insert(OFMake_pair(IntracardiacRoute, DSRBasicCodedEntry("372460008", "SCT", "Intracardiac route"))); + Codes->insert(OFMake_pair(IntraventricularRouteCardiac, DSRBasicCodedEntry("420287000", "SCT", "Intraventricular route - cardiac"))); Codes->insert(OFMake_pair(RetroOrbitalRoute, DSRBasicCodedEntry("127070", "DCM", "Retro-orbital route"))); - Codes->insert(OFMake_pair(NasalRoute, DSRBasicCodedEntry("G-D172", "SRT", "Nasal route"))); - Codes->insert(OFMake_pair(IntradermalRoute, DSRBasicCodedEntry("G-D17D", "SRT", "Intradermal route"))); - Codes->insert(OFMake_pair(IntratumorRoute, DSRBasicCodedEntry("R-F2CD4", "SRT", "Intratumor route"))); + Codes->insert(OFMake_pair(NasalRoute, DSRBasicCodedEntry("46713006", "SCT", "Nasal route"))); + Codes->insert(OFMake_pair(IntradermalRoute, DSRBasicCodedEntry("372464004", "SCT", "Intradermal route"))); + Codes->insert(OFMake_pair(IntratumorRoute, DSRBasicCodedEntry("447122006", "SCT", "Intratumor route"))); } /* should never be NULL */ return *Codes; diff --git a/dcmsr/libcmr/cid244.cc b/dcmsr/libcmr/cid244.cc index d829351b..5c306897 100644 --- a/dcmsr/libcmr/cid244.cc +++ b/dcmsr/libcmr/cid244.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID244_Laterality * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:14 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:16 by J. Riesmeier * */ @@ -149,10 +149,10 @@ CID244_Laterality::CodeList &CID244_Laterality::getCodes() /* create a new code list (should never fail) */ Codes = new CodeList(); /* and initialize it by adding the coded entries */ - Codes->insert(OFMake_pair(Right, DSRBasicCodedEntry("G-A100", "SRT", "Right"))); - Codes->insert(OFMake_pair(Left, DSRBasicCodedEntry("G-A101", "SRT", "Left"))); - Codes->insert(OFMake_pair(RightAndLeft, DSRBasicCodedEntry("G-A102", "SRT", "Right and left"))); - Codes->insert(OFMake_pair(Unilateral, DSRBasicCodedEntry("G-A103", "SRT", "Unilateral"))); + Codes->insert(OFMake_pair(Right, DSRBasicCodedEntry("24028007", "SCT", "Right"))); + Codes->insert(OFMake_pair(Left, DSRBasicCodedEntry("7771000", "SCT", "Left"))); + Codes->insert(OFMake_pair(Bilateral, DSRBasicCodedEntry("51440002", "SCT", "Bilateral"))); + Codes->insert(OFMake_pair(Unilateral, DSRBasicCodedEntry("66459002", "SCT", "Unilateral"))); } /* should never be NULL */ return *Codes; diff --git a/dcmsr/libcmr/cid244e.cc b/dcmsr/libcmr/cid244e.cc index b239b81d..9518e4a7 100644 --- a/dcmsr/libcmr/cid244e.cc +++ b/dcmsr/libcmr/cid244e.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID244e_Laterality @@ -74,7 +74,7 @@ OFCondition CID244e_Laterality::mapImageLaterality(const OFString &enumeratedVal else if (enumeratedValue == "L") // left codedEntryValue = getCodedEntry(Left); else if (enumeratedValue == "B") // both left and right - codedEntryValue = getCodedEntry(RightAndLeft); + codedEntryValue = getCodedEntry(Bilateral); else if (enumeratedValue == "U") // unpaired codedEntryValue = getCodedEntry(Unilateral); else diff --git a/dcmsr/libcmr/cid29.cc b/dcmsr/libcmr/cid29.cc index 8cc9b3ff..cada2dd6 100644 --- a/dcmsr/libcmr/cid29.cc +++ b/dcmsr/libcmr/cid29.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID29_AcquisitionModality * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:09 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:11 by J. Riesmeier * */ @@ -18,7 +18,7 @@ // general information on CID 29 (Acquisition Modality) #define CONTEXT_GROUP_NUMBER "29" -#define CONTEXT_GROUP_VERSION "20180605" +#define CONTEXT_GROUP_VERSION "20190327" #define CONTEXT_GROUP_UID "1.2.840.10008.6.1.19" #define CONTEXT_GROUP_TYPE OFTrue /* extensible */ @@ -150,15 +150,16 @@ CID29_AcquisitionModality::CodeList &CID29_AcquisitionModality::getCodes() Codes = new CodeList(); /* and initialize it by adding the coded entries */ Codes->insert(OFMake_pair(Autorefraction, DSRBasicCodedEntry("AR", "DCM", "Autorefraction"))); - Codes->insert(OFMake_pair(BoneMineralDensitometry, DSRBasicCodedEntry("BMD", "DCM", "Bone Mineral Densitometry"))); Codes->insert(OFMake_pair(UltrasoundBoneDensitometry, DSRBasicCodedEntry("BDUS", "DCM", "Ultrasound Bone Densitometry"))); - Codes->insert(OFMake_pair(CardiacElectrophysiology, DSRBasicCodedEntry("EPS", "DCM", "Cardiac Electrophysiology"))); + Codes->insert(OFMake_pair(BiomagneticImaging, DSRBasicCodedEntry("BI", "DCM", "Biomagnetic Imaging"))); + Codes->insert(OFMake_pair(BoneMineralDensitometry, DSRBasicCodedEntry("BMD", "DCM", "Bone Mineral Densitometry"))); Codes->insert(OFMake_pair(ComputedRadiography, DSRBasicCodedEntry("CR", "DCM", "Computed Radiography"))); Codes->insert(OFMake_pair(ComputedTomography, DSRBasicCodedEntry("CT", "DCM", "Computed Tomography"))); + Codes->insert(OFMake_pair(Diaphanography, DSRBasicCodedEntry("DG", "DCM", "Diaphanography"))); Codes->insert(OFMake_pair(DigitalRadiography, DSRBasicCodedEntry("DX", "DCM", "Digital Radiography"))); Codes->insert(OFMake_pair(Electrocardiography, DSRBasicCodedEntry("ECG", "DCM", "Electrocardiography"))); + Codes->insert(OFMake_pair(CardiacElectrophysiology, DSRBasicCodedEntry("EPS", "DCM", "Cardiac Electrophysiology"))); Codes->insert(OFMake_pair(Endoscopy, DSRBasicCodedEntry("ES", "DCM", "Endoscopy"))); - Codes->insert(OFMake_pair(ExternalCameraPhotography, DSRBasicCodedEntry("XC", "DCM", "External-camera Photography"))); Codes->insert(OFMake_pair(GeneralMicroscopy, DSRBasicCodedEntry("GM", "DCM", "General Microscopy"))); Codes->insert(OFMake_pair(HemodynamicWaveform, DSRBasicCodedEntry("HD", "DCM", "Hemodynamic Waveform"))); Codes->insert(OFMake_pair(IntraOralRadiography, DSRBasicCodedEntry("IO", "DCM", "Intra-oral Radiography"))); @@ -166,28 +167,32 @@ CID29_AcquisitionModality::CodeList &CID29_AcquisitionModality::getCodes() Codes->insert(OFMake_pair(IntravascularUltrasound, DSRBasicCodedEntry("IVUS", "DCM", "Intravascular Ultrasound"))); Codes->insert(OFMake_pair(Keratometry, DSRBasicCodedEntry("KER", "DCM", "Keratometry"))); Codes->insert(OFMake_pair(Lensometry, DSRBasicCodedEntry("LEN", "DCM", "Lensometry"))); - Codes->insert(OFMake_pair(MagneticResonance, DSRBasicCodedEntry("MR", "DCM", "Magnetic Resonance"))); + Codes->insert(OFMake_pair(LaserScan, DSRBasicCodedEntry("LS", "DCM", "Laser Scan"))); Codes->insert(OFMake_pair(Mammography, DSRBasicCodedEntry("MG", "DCM", "Mammography"))); + Codes->insert(OFMake_pair(MagneticResonance, DSRBasicCodedEntry("MR", "DCM", "Magnetic Resonance"))); Codes->insert(OFMake_pair(NuclearMedicine, DSRBasicCodedEntry("NM", "DCM", "Nuclear Medicine"))); Codes->insert(OFMake_pair(OphthalmicAxialMeasurements, DSRBasicCodedEntry("OAM", "DCM", "Ophthalmic Axial Measurements"))); Codes->insert(OFMake_pair(OpticalCoherenceTomography, DSRBasicCodedEntry("OCT", "DCM", "Optical Coherence Tomography"))); - Codes->insert(OFMake_pair(OphthalmicMapping, DSRBasicCodedEntry("OPM", "DCM", "Ophthalmic Mapping"))); Codes->insert(OFMake_pair(OphthalmicPhotography, DSRBasicCodedEntry("OP", "DCM", "Ophthalmic Photography"))); - Codes->insert(OFMake_pair(OphthalmicRefraction, DSRBasicCodedEntry("OPR", "DCM", "Ophthalmic Refraction"))); + Codes->insert(OFMake_pair(OphthalmicMapping, DSRBasicCodedEntry("OPM", "DCM", "Ophthalmic Mapping"))); Codes->insert(OFMake_pair(OphthalmicTomography, DSRBasicCodedEntry("OPT", "DCM", "Ophthalmic Tomography"))); Codes->insert(OFMake_pair(OphthalmicTomographyBScanVolumeAnalysis, DSRBasicCodedEntry("OPTBSV", "DCM", "Ophthalmic Tomography B-scan Volume Analysis"))); Codes->insert(OFMake_pair(OphthalmicTomographyEnFace, DSRBasicCodedEntry("OPTENF", "DCM", "Ophthalmic Tomography En Face"))); Codes->insert(OFMake_pair(OphthalmicVisualField, DSRBasicCodedEntry("OPV", "DCM", "Ophthalmic Visual Field"))); Codes->insert(OFMake_pair(OpticalSurfaceScanner, DSRBasicCodedEntry("OSS", "DCM", "Optical Surface Scanner"))); - Codes->insert(OFMake_pair(PanoramicXRay, DSRBasicCodedEntry("PX", "DCM", "Panoramic X-Ray"))); Codes->insert(OFMake_pair(PositronEmissionTomography, DSRBasicCodedEntry("PT", "DCM", "Positron emission tomography"))); + Codes->insert(OFMake_pair(PanoramicXRay, DSRBasicCodedEntry("PX", "DCM", "Panoramic X-Ray"))); + Codes->insert(OFMake_pair(RespiratoryWaveform, DSRBasicCodedEntry("RESP", "DCM", "Respiratory Waveform"))); Codes->insert(OFMake_pair(Radiofluoroscopy, DSRBasicCodedEntry("RF", "DCM", "Radiofluoroscopy"))); Codes->insert(OFMake_pair(RadiographicImaging, DSRBasicCodedEntry("RG", "DCM", "Radiographic imaging"))); + Codes->insert(OFMake_pair(RTImage, DSRBasicCodedEntry("RTIMAGE", "DCM", "RT Image"))); Codes->insert(OFMake_pair(SlideMicroscopy, DSRBasicCodedEntry("SM", "DCM", "Slide Microscopy"))); Codes->insert(OFMake_pair(SubjectiveRefraction, DSRBasicCodedEntry("SRF", "DCM", "Subjective Refraction"))); + Codes->insert(OFMake_pair(Thermography, DSRBasicCodedEntry("TG", "DCM", "Thermography"))); Codes->insert(OFMake_pair(Ultrasound, DSRBasicCodedEntry("US", "DCM", "Ultrasound"))); Codes->insert(OFMake_pair(VisualAcuity, DSRBasicCodedEntry("VA", "DCM", "Visual Acuity"))); Codes->insert(OFMake_pair(XRayAngiography, DSRBasicCodedEntry("XA", "DCM", "X-Ray Angiography"))); + Codes->insert(OFMake_pair(ExternalCameraPhotography, DSRBasicCodedEntry("XC", "DCM", "External-camera Photography"))); } /* should never be NULL */ return *Codes; diff --git a/dcmsr/libcmr/cid4020.cc b/dcmsr/libcmr/cid4020.cc index 49071f29..f6df7674 100644 --- a/dcmsr/libcmr/cid4020.cc +++ b/dcmsr/libcmr/cid4020.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID4020_PETRadionuclide * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:15 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:18 by J. Riesmeier * */ @@ -149,41 +149,41 @@ CID4020_PETRadionuclide::CodeList &CID4020_PETRadionuclide::getCodes() /* create a new code list (should never fail) */ Codes = new CodeList(); /* and initialize it by adding the coded entries */ - Codes->insert(OFMake_pair(_11_Carbon, DSRBasicCodedEntry("C-105A1", "SRT", "^11^Carbon"))); - Codes->insert(OFMake_pair(_13_Nitrogen, DSRBasicCodedEntry("C-107A1", "SRT", "^13^Nitrogen"))); - Codes->insert(OFMake_pair(_14_Oxygen, DSRBasicCodedEntry("C-1018C", "SRT", "^14^Oxygen"))); - Codes->insert(OFMake_pair(_15_Oxygen, DSRBasicCodedEntry("C-B1038", "SRT", "^15^Oxygen"))); - Codes->insert(OFMake_pair(_18_Fluorine, DSRBasicCodedEntry("C-111A1", "SRT", "^18^Fluorine"))); - Codes->insert(OFMake_pair(_22_Sodium, DSRBasicCodedEntry("C-155A1", "SRT", "^22^Sodium"))); - Codes->insert(OFMake_pair(_38_Potassium, DSRBasicCodedEntry("C-135A4", "SRT", "^38^Potassium"))); + Codes->insert(OFMake_pair(_11_Carbon, DSRBasicCodedEntry("40565003", "SCT", "^11^Carbon"))); + Codes->insert(OFMake_pair(_13_Nitrogen, DSRBasicCodedEntry("21576001", "SCT", "^13^Nitrogen"))); + Codes->insert(OFMake_pair(_14_Oxygen, DSRBasicCodedEntry("424875009", "SCT", "^14^Oxygen"))); + Codes->insert(OFMake_pair(_15_Oxygen, DSRBasicCodedEntry("129504001", "SCT", "^15^Oxygen"))); + Codes->insert(OFMake_pair(_18_Fluorine, DSRBasicCodedEntry("77004003", "SCT", "^18^Fluorine"))); + Codes->insert(OFMake_pair(_22_Sodium, DSRBasicCodedEntry("71633006", "SCT", "^22^Sodium"))); + Codes->insert(OFMake_pair(_38_Potassium, DSRBasicCodedEntry("423764008", "SCT", "^38^Potassium"))); Codes->insert(OFMake_pair(_43_Scandium, DSRBasicCodedEntry("126605", "DCM", "^43^Scandium"))); Codes->insert(OFMake_pair(_44_Scandium, DSRBasicCodedEntry("126600", "DCM", "^44^Scandium"))); - Codes->insert(OFMake_pair(_45_Titanium, DSRBasicCodedEntry("C-166A2", "SRT", "^45^Titanium"))); + Codes->insert(OFMake_pair(_45_Titanium, DSRBasicCodedEntry("75696008", "SCT", "^45^Titanium"))); Codes->insert(OFMake_pair(_51_Manganese, DSRBasicCodedEntry("126601", "DCM", "^51^Manganese"))); - Codes->insert(OFMake_pair(_52_Iron, DSRBasicCodedEntry("C-130A1", "SRT", "^52^Iron"))); - Codes->insert(OFMake_pair(_52_Manganese, DSRBasicCodedEntry("C-149A1", "SRT", "^52^Manganese"))); + Codes->insert(OFMake_pair(_52_Iron, DSRBasicCodedEntry("69089000", "SCT", "^52^Iron"))); + Codes->insert(OFMake_pair(_52_Manganese, DSRBasicCodedEntry("37225000", "SCT", "^52^Manganese"))); Codes->insert(OFMake_pair(_52m_Manganese, DSRBasicCodedEntry("126607", "DCM", "^52m^Manganese"))); - Codes->insert(OFMake_pair(_60_Copper, DSRBasicCodedEntry("C-127A4", "SRT", "^60^Copper"))); - Codes->insert(OFMake_pair(_61_Copper, DSRBasicCodedEntry("C-127A1", "SRT", "^61^Copper"))); - Codes->insert(OFMake_pair(_62_Copper, DSRBasicCodedEntry("C-127A5", "SRT", "^62^Copper"))); - Codes->insert(OFMake_pair(_62_Zinc, DSRBasicCodedEntry("C-141A1", "SRT", "^62^Zinc"))); - Codes->insert(OFMake_pair(_64_Copper, DSRBasicCodedEntry("C-127A2", "SRT", "^64^Copper"))); - Codes->insert(OFMake_pair(_66_Gallium, DSRBasicCodedEntry("C-131A1", "SRT", "^66^Gallium"))); - Codes->insert(OFMake_pair(_68_Gallium, DSRBasicCodedEntry("C-131A3", "SRT", "^68^Gallium"))); - Codes->insert(OFMake_pair(_68_Germanium, DSRBasicCodedEntry("C-128A2", "SRT", "^68^Germanium"))); + Codes->insert(OFMake_pair(_60_Copper, DSRBasicCodedEntry("425364008", "SCT", "^60^Copper"))); + Codes->insert(OFMake_pair(_61_Copper, DSRBasicCodedEntry("71425003", "SCT", "^61^Copper"))); + Codes->insert(OFMake_pair(_62_Copper, DSRBasicCodedEntry("422934004", "SCT", "^62^Copper"))); + Codes->insert(OFMake_pair(_62_Zinc, DSRBasicCodedEntry("65054007", "SCT", "^62^Zinc"))); + Codes->insert(OFMake_pair(_64_Copper, DSRBasicCodedEntry("3932008", "SCT", "^64^Copper"))); + Codes->insert(OFMake_pair(_66_Gallium, DSRBasicCodedEntry("79477007", "SCT", "^66^Gallium"))); + Codes->insert(OFMake_pair(_68_Gallium, DSRBasicCodedEntry("35337001", "SCT", "^68^Gallium"))); + Codes->insert(OFMake_pair(_68_Germanium, DSRBasicCodedEntry("53315004", "SCT", "^68^Germanium"))); Codes->insert(OFMake_pair(_70_Arsenic, DSRBasicCodedEntry("126602", "DCM", "^70^Arsenic"))); - Codes->insert(OFMake_pair(_72_Arsenic, DSRBasicCodedEntry("C-115A2", "SRT", "^72^Arsenic"))); - Codes->insert(OFMake_pair(_73_Selenium, DSRBasicCodedEntry("C-116A2", "SRT", "^73^Selenium"))); - Codes->insert(OFMake_pair(_75_Bromine, DSRBasicCodedEntry("C-113A1", "SRT", "^75^Bromine"))); - Codes->insert(OFMake_pair(_76_Bromine, DSRBasicCodedEntry("C-113A2", "SRT", "^76^Bromine"))); - Codes->insert(OFMake_pair(_77_Bromine, DSRBasicCodedEntry("C-113A3", "SRT", "^77^Bromine"))); - Codes->insert(OFMake_pair(_82_Rubidium, DSRBasicCodedEntry("C-159A2", "SRT", "^82^Rubidium"))); - Codes->insert(OFMake_pair(_86_Yttrium, DSRBasicCodedEntry("C-162A3", "SRT", "^86^Yttrium"))); - Codes->insert(OFMake_pair(_89_Zirconium, DSRBasicCodedEntry("C-168A4", "SRT", "^89^Zirconium"))); + Codes->insert(OFMake_pair(_72_Arsenic, DSRBasicCodedEntry("2705002", "SCT", "^72^Arsenic"))); + Codes->insert(OFMake_pair(_73_Selenium, DSRBasicCodedEntry("87437000", "SCT", "^73^Selenium"))); + Codes->insert(OFMake_pair(_75_Bromine, DSRBasicCodedEntry("17910003", "SCT", "^75^Bromine"))); + Codes->insert(OFMake_pair(_76_Bromine, DSRBasicCodedEntry("79523006", "SCT", "^76^Bromine"))); + Codes->insert(OFMake_pair(_77_Bromine, DSRBasicCodedEntry("86521004", "SCT", "^77^Bromine"))); + Codes->insert(OFMake_pair(_82_Rubidium, DSRBasicCodedEntry("79197006", "SCT", "^82^Rubidium"))); + Codes->insert(OFMake_pair(_86_Yttrium, DSRBasicCodedEntry("10738001", "SCT", "^86^Yttrium"))); + Codes->insert(OFMake_pair(_89_Zirconium, DSRBasicCodedEntry("63360001", "SCT", "^89^Zirconium"))); Codes->insert(OFMake_pair(_90_Niobium, DSRBasicCodedEntry("126603", "DCM", "^90^Niobium"))); - Codes->insert(OFMake_pair(_90_Yttrium, DSRBasicCodedEntry("C-162A7", "SRT", "^90^Yttrium"))); - Codes->insert(OFMake_pair(_94m_Technetium, DSRBasicCodedEntry("C-163AA", "SRT", "^94m^Technetium"))); - Codes->insert(OFMake_pair(_124_Iodine, DSRBasicCodedEntry("C-114A5", "SRT", "^124^Iodine"))); + Codes->insert(OFMake_pair(_90_Yttrium, DSRBasicCodedEntry("14691008", "SCT", "^90^Yttrium"))); + Codes->insert(OFMake_pair(_94m_Technetium, DSRBasicCodedEntry("424079002", "SCT", "^94m^Technetium"))); + Codes->insert(OFMake_pair(_124_Iodine, DSRBasicCodedEntry("40937006", "SCT", "^124^Iodine"))); Codes->insert(OFMake_pair(_152_Terbium, DSRBasicCodedEntry("126606", "DCM", "^152^Terbium"))); } /* should never be NULL */ diff --git a/dcmsr/libcmr/cid4021.cc b/dcmsr/libcmr/cid4021.cc index f51cc05b..abb3ca13 100644 --- a/dcmsr/libcmr/cid4021.cc +++ b/dcmsr/libcmr/cid4021.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID4021_PETRadiopharmaceutical * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:17 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:20 by J. Riesmeier * */ @@ -18,7 +18,7 @@ // general information on CID 4021 (PET Radiopharmaceutical) #define CONTEXT_GROUP_NUMBER "4021" -#define CONTEXT_GROUP_VERSION "20180327" +#define CONTEXT_GROUP_VERSION "20190124" #define CONTEXT_GROUP_UID "1.2.840.10008.6.1.305" #define CONTEXT_GROUP_TYPE OFTrue /* extensible */ @@ -153,23 +153,23 @@ CID4021_PETRadiopharmaceutical::CodeList &CID4021_PETRadiopharmaceutical::getCod Codes->insert(OFMake_pair(_2FA_F18, DSRBasicCodedEntry("126713", "DCM", "2FA F^18^"))); Codes->insert(OFMake_pair(_7D12_89Zr, DSRBasicCodedEntry("126751", "DCM", "7D12 ^89^Zr"))); Codes->insert(OFMake_pair(_7E11_89Zr, DSRBasicCodedEntry("126750", "DCM", "7E11 ^89^Zr"))); - Codes->insert(OFMake_pair(Acetate_C11, DSRBasicCodedEntry("C-B1043", "SRT", "Acetate C^11^"))); + Codes->insert(OFMake_pair(Acetate_C11, DSRBasicCodedEntry("129513004", "SCT", "Acetate C^11^"))); Codes->insert(OFMake_pair(AGN150998_89Zr, DSRBasicCodedEntry("126729", "DCM", "AGN-150998 ^89^Zr"))); - Codes->insert(OFMake_pair(Ammonia_N13, DSRBasicCodedEntry("C-B103C", "SRT", "Ammonia N^13^"))); + Codes->insert(OFMake_pair(Ammonia_N13, DSRBasicCodedEntry("129508003", "SCT", "Ammonia N^13^"))); Codes->insert(OFMake_pair(AntiB220_89Zr, DSRBasicCodedEntry("126754", "DCM", "Anti-B220 ^89^Zr"))); Codes->insert(OFMake_pair(ATSM_Cu60, DSRBasicCodedEntry("126700", "DCM", "ATSM Cu^60^"))); Codes->insert(OFMake_pair(ATSM_Cu61, DSRBasicCodedEntry("126701", "DCM", "ATSM Cu^61^"))); Codes->insert(OFMake_pair(ATSM_Cu62, DSRBasicCodedEntry("126702", "DCM", "ATSM Cu^62^"))); - Codes->insert(OFMake_pair(ATSM_Cu64, DSRBasicCodedEntry("C-B07DB", "SRT", "ATSM Cu^64^"))); + Codes->insert(OFMake_pair(ATSM_Cu64, DSRBasicCodedEntry("422855001", "SCT", "ATSM Cu^64^"))); Codes->insert(OFMake_pair(Benralizumab_89Zr, DSRBasicCodedEntry("126722", "DCM", "Benralizumab ^89^Zr"))); Codes->insert(OFMake_pair(Bevacizumab_89Zr, DSRBasicCodedEntry("126516", "DCM", "Bevacizumab ^89^Zr"))); Codes->insert(OFMake_pair(Blinatumomab_89Zr, DSRBasicCodedEntry("126727", "DCM", "Blinatumomab ^89^Zr"))); Codes->insert(OFMake_pair(Brentuximab_89Zr, DSRBasicCodedEntry("126735", "DCM", "Brentuximab ^89^Zr"))); - Codes->insert(OFMake_pair(Butanol_O15, DSRBasicCodedEntry("C-B07DC", "SRT", "Butanol O^15^"))); - Codes->insert(OFMake_pair(CarbonDioxide_O15, DSRBasicCodedEntry("C-B103B", "SRT", "Carbon dioxide O^15^"))); - Codes->insert(OFMake_pair(CarbonMonoxide_C11, DSRBasicCodedEntry("C-B1045", "SRT", "Carbon monoxide C^11^"))); - Codes->insert(OFMake_pair(CarbonMonoxide_O15, DSRBasicCodedEntry("C-B103A", "SRT", "Carbon monoxide O^15^"))); - Codes->insert(OFMake_pair(Carfentanil_C11, DSRBasicCodedEntry("C-B103F", "SRT", "Carfentanil C^11^"))); + Codes->insert(OFMake_pair(Butanol_O15, DSRBasicCodedEntry("422540000", "SCT", "Butanol O^15^"))); + Codes->insert(OFMake_pair(CarbonDioxide_O15, DSRBasicCodedEntry("129507008", "SCT", "Carbon dioxide O^15^"))); + Codes->insert(OFMake_pair(CarbonMonoxide_C11, DSRBasicCodedEntry("129515006", "SCT", "Carbon monoxide C^11^"))); + Codes->insert(OFMake_pair(CarbonMonoxide_O15, DSRBasicCodedEntry("129506004", "SCT", "Carbon monoxide O^15^"))); + Codes->insert(OFMake_pair(Carfentanil_C11, DSRBasicCodedEntry("129511002", "SCT", "Carfentanil C^11^"))); Codes->insert(OFMake_pair(Cetuximab_89Zr, DSRBasicCodedEntry("126513", "DCM", "Cetuximab ^89^Zr"))); Codes->insert(OFMake_pair(CG250Fab2_89Zr, DSRBasicCodedEntry("126517", "DCM", "cG250-F(ab')(2) ^89^Zr"))); Codes->insert(OFMake_pair(Choline_C11, DSRBasicCodedEntry("126703", "DCM", "Choline C^11^"))); @@ -177,6 +177,8 @@ CID4021_PETRadiopharmaceutical::CodeList &CID4021_PETRadiopharmaceutical::getCod Codes->insert(OFMake_pair(CLR1404_I131, DSRBasicCodedEntry("126716", "DCM", "CLR1404 I^131^"))); Codes->insert(OFMake_pair(CMAbU36_89Zr, DSRBasicCodedEntry("126746", "DCM", "cMAb U36 ^89^Zr"))); Codes->insert(OFMake_pair(CU36_89Zr, DSRBasicCodedEntry("126515", "DCM", "cU36 ^89^Zr"))); + Codes->insert(OFMake_pair(DCFBC_F18, DSRBasicCodedEntry("C96234", "NCIt", "DCFBC F^18^"))); + Codes->insert(OFMake_pair(DCFPyL_F18, DSRBasicCodedEntry("C116352", "NCIt", "DCFPyL F^18^"))); Codes->insert(OFMake_pair(DfFK2_89Zr, DSRBasicCodedEntry("126762", "DCM", "Df-[FK](2) ^89^Zr"))); Codes->insert(OFMake_pair(DfFK23PEG4_89Zr, DSRBasicCodedEntry("126763", "DCM", "Df-[FK](2)-3PEG(4) ^89^Zr"))); Codes->insert(OFMake_pair(DfCD45_89Zr, DSRBasicCodedEntry("126520", "DCM", "Df-CD45 ^89^Zr"))); @@ -186,36 +188,37 @@ CID4021_PETRadiopharmaceutical::CodeList &CID4021_PETRadiopharmaceutical::getCod Codes->insert(OFMake_pair(E4G10_89Zr, DSRBasicCodedEntry("126519", "DCM", "E4G10 ^89^Zr"))); Codes->insert(OFMake_pair(Ecromeximab_89Zr, DSRBasicCodedEntry("126732", "DCM", "Ecromeximab ^89^Zr"))); Codes->insert(OFMake_pair(Edotreotide_Ga68, DSRBasicCodedEntry("C2713594", "UMLS", "Edotreotide Ga^68^"))); - Codes->insert(OFMake_pair(EDTA_Ga68, DSRBasicCodedEntry("C-B07DD", "SRT", "EDTA Ga^68^"))); + Codes->insert(OFMake_pair(EDTA_Ga68, DSRBasicCodedEntry("423498000", "SCT", "EDTA Ga^68^"))); Codes->insert(OFMake_pair(Fallypride_C11, DSRBasicCodedEntry("126704", "DCM", "Fallypride C^11^"))); Codes->insert(OFMake_pair(Fallypride_F18, DSRBasicCodedEntry("126705", "DCM", "Fallypride F^18^"))); Codes->insert(OFMake_pair(FLB457_C11, DSRBasicCodedEntry("126706", "DCM", "FLB 457 C^11^"))); - Codes->insert(OFMake_pair(Florbetaben_F18, DSRBasicCodedEntry("C-D6858", "SRT", "Florbetaben F^18^"))); - Codes->insert(OFMake_pair(Florbetapir_F18, DSRBasicCodedEntry("C-E0269", "SRT", "Florbetapir F^18^"))); + Codes->insert(OFMake_pair(Florbetaben_F18, DSRBasicCodedEntry("712736002", "SCT", "Florbetaben F^18^"))); + Codes->insert(OFMake_pair(Florbetapir_F18, DSRBasicCodedEntry("456995000", "SCT", "Florbetapir F^18^"))); + Codes->insert(OFMake_pair(Flortaucipir_F18, DSRBasicCodedEntry("C4547429", "UMLS", "Flortaucipir F^18^"))); Codes->insert(OFMake_pair(Flubatine_F18, DSRBasicCodedEntry("126503", "DCM", "Flubatine F^18^"))); - Codes->insert(OFMake_pair(Fluciclatide_F18, DSRBasicCodedEntry("C-E0265", "SRT", "Fluciclatide F^18^"))); - Codes->insert(OFMake_pair(Fluciclovine_F18, DSRBasicCodedEntry("C-E026A", "SRT", "Fluciclovine F^18^"))); - Codes->insert(OFMake_pair(Flumazenil_C11, DSRBasicCodedEntry("C-B07DE", "SRT", "Flumazenil C^11^"))); - Codes->insert(OFMake_pair(Flumazenil_F18, DSRBasicCodedEntry("C-B07DF", "SRT", "Flumazenil F^18^"))); - Codes->insert(OFMake_pair(Fluorethyltyrosin_F18, DSRBasicCodedEntry("C-B07E0", "SRT", "Fluorethyltyrosin F^18^"))); - Codes->insert(OFMake_pair(Fluorobenzothiazole_F18, DSRBasicCodedEntry("C-B07E4", "SRT", "Fluorobenzothiazole F^18^"))); - Codes->insert(OFMake_pair(Fluorocholine_F18, DSRBasicCodedEntry("C-E0273", "SRT", "Fluorocholine F^18^"))); - Codes->insert(OFMake_pair(Fluorodeoxyglucose_F18, DSRBasicCodedEntry("C-B1031", "SRT", "Fluorodeoxyglucose F^18^"))); + Codes->insert(OFMake_pair(Fluciclatide_F18, DSRBasicCodedEntry("456999006", "SCT", "Fluciclatide F^18^"))); + Codes->insert(OFMake_pair(Fluciclovine_F18, DSRBasicCodedEntry("457000009", "SCT", "Fluciclovine F^18^"))); + Codes->insert(OFMake_pair(Flumazenil_C11, DSRBasicCodedEntry("423543007", "SCT", "Flumazenil C^11^"))); + Codes->insert(OFMake_pair(Flumazenil_F18, DSRBasicCodedEntry("422975006", "SCT", "Flumazenil F^18^"))); + Codes->insert(OFMake_pair(Fluorethyltyrosin_F18, DSRBasicCodedEntry("424708001", "SCT", "Fluorethyltyrosin F^18^"))); + Codes->insert(OFMake_pair(Fluorobenzothiazole_F18, DSRBasicCodedEntry("423546004", "SCT", "Fluorobenzothiazole F^18^"))); + Codes->insert(OFMake_pair(Fluorocholine_F18, DSRBasicCodedEntry("456992002", "SCT", "Fluorocholine F^18^"))); + Codes->insert(OFMake_pair(Fluorodeoxyglucose_F18, DSRBasicCodedEntry("35321007", "SCT", "Fluorodeoxyglucose F^18^"))); Codes->insert(OFMake_pair(FluoroestradiolFES_F18, DSRBasicCodedEntry("C1831937", "UMLS", "Fluoroestradiol (FES) F^18^"))); Codes->insert(OFMake_pair(Fluoroetanidazole_F18, DSRBasicCodedEntry("C1541539", "UMLS", "Fluoroetanidazole F^18^"))); - Codes->insert(OFMake_pair(FluoroLDopa_F18, DSRBasicCodedEntry("C-B1034", "SRT", "Fluoro-L-dopa F^18^"))); - Codes->insert(OFMake_pair(Fluoromethane_F18, DSRBasicCodedEntry("C-B07E2", "SRT", "Fluoromethane F^18^"))); - Codes->insert(OFMake_pair(Fluoromisonidazole_F18, DSRBasicCodedEntry("C-B07E1", "SRT", "Fluoromisonidazole F^18^"))); + Codes->insert(OFMake_pair(FluoroLDopa_F18, DSRBasicCodedEntry("129500005", "SCT", "Fluoro-L-dopa F^18^"))); + Codes->insert(OFMake_pair(Fluoromethane_F18, DSRBasicCodedEntry("422763008", "SCT", "Fluoromethane F^18^"))); + Codes->insert(OFMake_pair(Fluoromisonidazole_F18, DSRBasicCodedEntry("422598008", "SCT", "Fluoromisonidazole F^18^"))); Codes->insert(OFMake_pair(FluoropropylDihydrotetrabenazineDTBZ_F18, DSRBasicCodedEntry("C2934038", "UMLS", "Fluoropropyl-dihydrotetrabenazine (DTBZ) F^18^"))); Codes->insert(OFMake_pair(Fluorotriopride_F18, DSRBasicCodedEntry("126707", "DCM", "Fluorotriopride F^18^"))); - Codes->insert(OFMake_pair(Fluorouracil_F18, DSRBasicCodedEntry("C-B07E3", "SRT", "Fluorouracil F^18^"))); + Codes->insert(OFMake_pair(Fluorouracil_F18, DSRBasicCodedEntry("425236000", "SCT", "Fluorouracil F^18^"))); Codes->insert(OFMake_pair(Flurpiridaz_F18, DSRBasicCodedEntry("126718", "DCM", "Flurpiridaz F^18^"))); - Codes->insert(OFMake_pair(Flutemetamol_F18, DSRBasicCodedEntry("C-E0267", "SRT", "Flutemetamol F^18^"))); + Codes->insert(OFMake_pair(Flutemetamol_F18, DSRBasicCodedEntry("456997008", "SCT", "Flutemetamol F^18^"))); Codes->insert(OFMake_pair(Fresolimumab_89Zr, DSRBasicCodedEntry("126748", "DCM", "Fresolimumab ^89^Zr"))); Codes->insert(OFMake_pair(GA201_89Zr, DSRBasicCodedEntry("126731", "DCM", "GA201 ^89^Zr"))); - Codes->insert(OFMake_pair(Germanium_Ge68, DSRBasicCodedEntry("C-B1046", "SRT", "Germanium Ge^68^"))); + Codes->insert(OFMake_pair(Germanium_Ge68, DSRBasicCodedEntry("129516007", "SCT", "Germanium Ge^68^"))); Codes->insert(OFMake_pair(GlembatumumabVedotin_89Zr, DSRBasicCodedEntry("126724", "DCM", "Glembatumumab vedotin ^89^Zr"))); - Codes->insert(OFMake_pair(Glutamate_N13, DSRBasicCodedEntry("C-B103D", "SRT", "Glutamate N^13^"))); + Codes->insert(OFMake_pair(Glutamate_N13, DSRBasicCodedEntry("129509006", "SCT", "Glutamate N^13^"))); Codes->insert(OFMake_pair(Glutamine_C11, DSRBasicCodedEntry("126709", "DCM", "Glutamine C^11^"))); Codes->insert(OFMake_pair(Glutamine_C14, DSRBasicCodedEntry("126710", "DCM", "Glutamine C^14^"))); Codes->insert(OFMake_pair(Glutamine_F18, DSRBasicCodedEntry("126711", "DCM", "Glutamine F^18^"))); @@ -223,48 +226,56 @@ CID4021_PETRadiopharmaceutical::CodeList &CID4021_PETRadiopharmaceutical::getCod Codes->insert(OFMake_pair(J591_89Zr, DSRBasicCodedEntry("126514", "DCM", "J591 ^89^Zr"))); Codes->insert(OFMake_pair(Margetuximab_89Zr, DSRBasicCodedEntry("126740", "DCM", "Margetuximab ^89^Zr"))); Codes->insert(OFMake_pair(MEDI551_89Zr, DSRBasicCodedEntry("126730", "DCM", "MEDI-551 ^89^Zr"))); - Codes->insert(OFMake_pair(Mespiperone_C11, DSRBasicCodedEntry("C-B07E5", "SRT", "Mespiperone C^11^"))); - Codes->insert(OFMake_pair(Methionine_C11, DSRBasicCodedEntry("C-B103E", "SRT", "Methionine C^11^"))); + Codes->insert(OFMake_pair(Mespiperone_C11, DSRBasicCodedEntry("424789007", "SCT", "Mespiperone C^11^"))); + Codes->insert(OFMake_pair(Methionine_C11, DSRBasicCodedEntry("129510001", "SCT", "Methionine C^11^"))); + Codes->insert(OFMake_pair(MK6240_F18, DSRBasicCodedEntry("C4506764", "UMLS", "MK-6240 F^18^"))); Codes->insert(OFMake_pair(Mogamulizumab_89Zr, DSRBasicCodedEntry("126738", "DCM", "Mogamulizumab ^89^Zr"))); Codes->insert(OFMake_pair(MonoclonalAntibodymAb_64Cu, DSRBasicCodedEntry("126510", "DCM", "Monoclonal Antibody (mAb) ^64^Cu"))); Codes->insert(OFMake_pair(MonoclonalAntibodymAb_89Zr, DSRBasicCodedEntry("126511", "DCM", "Monoclonal Antibody (mAb) ^89^Zr"))); - Codes->insert(OFMake_pair(MonoclonalAntibody_I124, DSRBasicCodedEntry("C-B07E6", "SRT", "Monoclonal antibody I^124^"))); + Codes->insert(OFMake_pair(MonoclonalAntibody_I124, DSRBasicCodedEntry("424874008", "SCT", "Monoclonal antibody I^124^"))); Codes->insert(OFMake_pair(NanocolloidalAlbumin_89Zr, DSRBasicCodedEntry("126753", "DCM", "Nanocolloidal albumin ^89^Zr"))); Codes->insert(OFMake_pair(Nifene_F18, DSRBasicCodedEntry("126714", "DCM", "Nifene F^18^"))); Codes->insert(OFMake_pair(Obinituzimab_89Zr, DSRBasicCodedEntry("126721", "DCM", "Obinituzimab ^89^Zr"))); Codes->insert(OFMake_pair(Ocaratuzumab_89Zr, DSRBasicCodedEntry("126723", "DCM", "Ocaratuzumab ^89^Zr"))); - Codes->insert(OFMake_pair(Oxygen_O15, DSRBasicCodedEntry("C-B1038", "SRT", "Oxygen O^15^"))); - Codes->insert(OFMake_pair(OxygenWater_O15, DSRBasicCodedEntry("C-B1039", "SRT", "Oxygen-water O^15^"))); - Codes->insert(OFMake_pair(Palmitate_C11, DSRBasicCodedEntry("C-B1044", "SRT", "Palmitate C^11^"))); + Codes->insert(OFMake_pair(Oxygen_O15, DSRBasicCodedEntry("129504001", "SCT", "Oxygen O^15^"))); + Codes->insert(OFMake_pair(OxygenWater_O15, DSRBasicCodedEntry("129505000", "SCT", "Oxygen-water O^15^"))); + Codes->insert(OFMake_pair(Palmitate_C11, DSRBasicCodedEntry("129514005", "SCT", "Palmitate C^11^"))); Codes->insert(OFMake_pair(Panitumumab_89Zr, DSRBasicCodedEntry("126736", "DCM", "Panitumumab ^89^Zr"))); Codes->insert(OFMake_pair(Pegdinetanib_89Zr, DSRBasicCodedEntry("126728", "DCM", "Pegdinetanib ^89^Zr"))); Codes->insert(OFMake_pair(PinatuzumabVedotin_89Zr, DSRBasicCodedEntry("126725", "DCM", "Pinatuzumab vedotin ^89^Zr"))); Codes->insert(OFMake_pair(PittsburghCompoundB_C11, DSRBasicCodedEntry("126500", "DCM", "Pittsburgh compound B C^11^"))); Codes->insert(OFMake_pair(PolatuzumabVedotin_89Zr, DSRBasicCodedEntry("126726", "DCM", "Polatuzumab vedotin ^89^Zr"))); - Codes->insert(OFMake_pair(PTSM_Cu62, DSRBasicCodedEntry("C-B07E7", "SRT", "PTSM Cu^62^"))); + Codes->insert(OFMake_pair(PSMA1007_F18, DSRBasicCodedEntry("126758", "DCM", "PSMA-1007 F^18^"))); + Codes->insert(OFMake_pair(PSMA11_Ga68, DSRBasicCodedEntry("C118961", "NCIt", "PSMA-11 Ga^68^"))); + Codes->insert(OFMake_pair(PSMA617_Ga68, DSRBasicCodedEntry("126759", "DCM", "PSMA-617 Ga^68^"))); + Codes->insert(OFMake_pair(PTSM_Cu62, DSRBasicCodedEntry("422789008", "SCT", "PTSM Cu^62^"))); Codes->insert(OFMake_pair(R1507_89Zr, DSRBasicCodedEntry("126518", "DCM", "R1507 ^89^Zr"))); - Codes->insert(OFMake_pair(Raclopride_C11, DSRBasicCodedEntry("C-B1042", "SRT", "Raclopride C^11^"))); + Codes->insert(OFMake_pair(Raclopride_C11, DSRBasicCodedEntry("129512009", "SCT", "Raclopride C^11^"))); Codes->insert(OFMake_pair(Ranibizumab_89Zr, DSRBasicCodedEntry("126742", "DCM", "Ranibizumab ^89^Zr"))); Codes->insert(OFMake_pair(Rituximab_89Zr, DSRBasicCodedEntry("126737", "DCM", "Rituximab ^89^Zr"))); Codes->insert(OFMake_pair(RO5323441_89Zr, DSRBasicCodedEntry("126755", "DCM", "RO5323441 ^89^Zr"))); Codes->insert(OFMake_pair(RO542908_89Zr, DSRBasicCodedEntry("126756", "DCM", "RO542908 ^89^Zr"))); + Codes->insert(OFMake_pair(RO6924963_11C, DSRBasicCodedEntry("126719", "DCM", "RO6924963 ^11^C"))); + Codes->insert(OFMake_pair(RO6931643_11C, DSRBasicCodedEntry("126720", "DCM", "RO6931643 ^11^C"))); + Codes->insert(OFMake_pair(RO6958948_18F, DSRBasicCodedEntry("126757", "DCM", "RO6958948 ^18^F"))); Codes->insert(OFMake_pair(Roledumab_89Zr, DSRBasicCodedEntry("126733", "DCM", "Roledumab ^89^Zr"))); - Codes->insert(OFMake_pair(RubidiumChloride_Rb82, DSRBasicCodedEntry("C-B1037", "SRT", "Rubidium chloride Rb^82^"))); + Codes->insert(OFMake_pair(RubidiumChloride_Rb82, DSRBasicCodedEntry("129503007", "SCT", "Rubidium chloride Rb^82^"))); Codes->insert(OFMake_pair(SAR3419_89Zr, DSRBasicCodedEntry("126741", "DCM", "SAR3419 ^89^Zr"))); - Codes->insert(OFMake_pair(SodiumFluoride_F18, DSRBasicCodedEntry("C-B1032", "SRT", "Sodium fluoride F^18^"))); - Codes->insert(OFMake_pair(SodiumIodide_I124, DSRBasicCodedEntry("C-B07E8", "SRT", "Sodium iodide I^124^"))); - Codes->insert(OFMake_pair(Sodium_Na22, DSRBasicCodedEntry("C-B1047", "SRT", "Sodium Na^22^"))); - Codes->insert(OFMake_pair(Spiperone_F18, DSRBasicCodedEntry("C-B1033", "SRT", "Spiperone F^18^"))); + Codes->insert(OFMake_pair(Sarcosine_C11, DSRBasicCodedEntry("C122684", "NCIt", "Sarcosine C^11^"))); + Codes->insert(OFMake_pair(SodiumFluoride_F18, DSRBasicCodedEntry("129501009", "SCT", "Sodium fluoride F^18^"))); + Codes->insert(OFMake_pair(SodiumIodide_I124, DSRBasicCodedEntry("422980002", "SCT", "Sodium iodide I^124^"))); + Codes->insert(OFMake_pair(Sodium_Na22, DSRBasicCodedEntry("129517003", "SCT", "Sodium Na^22^"))); + Codes->insert(OFMake_pair(Spiperone_F18, DSRBasicCodedEntry("129499001", "SCT", "Spiperone F^18^"))); Codes->insert(OFMake_pair(T807_F18, DSRBasicCodedEntry("126502", "DCM", "T807 F^18^"))); - Codes->insert(OFMake_pair(THK5351_F18, DSRBasicCodedEntry("126717", "DCM", "THK5351 F^18^"))); - Codes->insert(OFMake_pair(ThymidineFLT_F18, DSRBasicCodedEntry("C-B1036", "SRT", "Thymidine (FLT) F^18^"))); + Codes->insert(OFMake_pair(THK5317_F18, DSRBasicCodedEntry("C4550127", "UMLS", "THK5317 F^18^"))); + Codes->insert(OFMake_pair(THK5351_F18, DSRBasicCodedEntry("C4279748", "UMLS", "THK5351 F^18^"))); + Codes->insert(OFMake_pair(ThymidineFLT_F18, DSRBasicCodedEntry("129502002", "SCT", "Thymidine (FLT) F^18^"))); Codes->insert(OFMake_pair(Trastuzumab_89Zr, DSRBasicCodedEntry("126512", "DCM", "Trastuzumab ^89^Zr"))); Codes->insert(OFMake_pair(TRC105_89Zr, DSRBasicCodedEntry("126749", "DCM", "TRC105 ^89^Zr"))); Codes->insert(OFMake_pair(Tyrosine3Octreotate_Ga68, DSRBasicCodedEntry("C1742831", "UMLS", "tyrosine-3-octreotate Ga^68^"))); Codes->insert(OFMake_pair(Ublituximab_89Zr, DSRBasicCodedEntry("126739", "DCM", "Ublituximab ^89^Zr"))); + Codes->insert(OFMake_pair(UCBJ_C11, DSRBasicCodedEntry("C4506788", "UMLS", "UCB-J C^11^"))); Codes->insert(OFMake_pair(XmAb5574_89Zr, DSRBasicCodedEntry("126734", "DCM", "XmAb5574 ^89^Zr"))); - Codes->insert(OFMake_pair(PSMA_Ga68, DSRBasicCodedEntry("C118961", "NCIt", "PSMA Ga^68^"))); - Codes->insert(OFMake_pair(Sarcosine_C11, DSRBasicCodedEntry("C122684", "NCIt", "Sarcosine C^11^"))); } /* should never be NULL */ return *Codes; diff --git a/dcmsr/libcmr/cid4031.cc b/dcmsr/libcmr/cid4031.cc index 4d038f48..f54c759c 100644 --- a/dcmsr/libcmr/cid4031.cc +++ b/dcmsr/libcmr/cid4031.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID4031_CommonAnatomicRegions * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:19 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:22 by J. Riesmeier * */ @@ -149,113 +149,113 @@ CID4031_CommonAnatomicRegions::CodeList &CID4031_CommonAnatomicRegions::getCodes /* create a new code list (should never fail) */ Codes = new CodeList(); /* and initialize it by adding the coded entries */ - Codes->insert(OFMake_pair(Abdomen, DSRBasicCodedEntry("T-D4000", "SRT", "Abdomen"))); - Codes->insert(OFMake_pair(AbdomenAndPelvis, DSRBasicCodedEntry("R-FAB57", "SRT", "Abdomen and Pelvis"))); - Codes->insert(OFMake_pair(AcromioclavicularJoint, DSRBasicCodedEntry("T-15420", "SRT", "Acromioclavicular joint"))); - Codes->insert(OFMake_pair(AnkleJoint, DSRBasicCodedEntry("T-15750", "SRT", "Ankle joint"))); - Codes->insert(OFMake_pair(Anus, DSRBasicCodedEntry("T-59900", "SRT", "Anus"))); - Codes->insert(OFMake_pair(ApexOfLung, DSRBasicCodedEntry("T-280A0", "SRT", "Apex of Lung"))); - Codes->insert(OFMake_pair(BileDuct, DSRBasicCodedEntry("T-60610", "SRT", "Bile duct"))); - Codes->insert(OFMake_pair(Bladder, DSRBasicCodedEntry("T-74000", "SRT", "Bladder"))); - Codes->insert(OFMake_pair(BoneOfLowerLimb, DSRBasicCodedEntry("T-12700", "SRT", "Bone of lower limb"))); - Codes->insert(OFMake_pair(BoneOfUpperLimb, DSRBasicCodedEntry("T-D0821", "SRT", "Bone of upper limb"))); - Codes->insert(OFMake_pair(Breast, DSRBasicCodedEntry("T-04000", "SRT", "Breast"))); - Codes->insert(OFMake_pair(Bronchus, DSRBasicCodedEntry("T-26000", "SRT", "Bronchus"))); - Codes->insert(OFMake_pair(Calcaneus, DSRBasicCodedEntry("T-12770", "SRT", "Calcaneus"))); - Codes->insert(OFMake_pair(CervicalSpine, DSRBasicCodedEntry("T-11501", "SRT", "Cervical spine"))); - Codes->insert(OFMake_pair(CervicoThoracicSpine, DSRBasicCodedEntry("T-D00F7", "SRT", "Cervico-thoracic spine"))); - Codes->insert(OFMake_pair(Chest, DSRBasicCodedEntry("T-D3000", "SRT", "Chest"))); - Codes->insert(OFMake_pair(ChestAndAbdomen, DSRBasicCodedEntry("R-FAB55", "SRT", "Chest and Abdomen"))); - Codes->insert(OFMake_pair(ChestAbdomenAndPelvis, DSRBasicCodedEntry("R-FAB56", "SRT", "Chest, Abdomen and Pelvis"))); - Codes->insert(OFMake_pair(Clavicle, DSRBasicCodedEntry("T-12310", "SRT", "Clavicle"))); - Codes->insert(OFMake_pair(Coccyx, DSRBasicCodedEntry("T-11BF0", "SRT", "Coccyx"))); - Codes->insert(OFMake_pair(Colon, DSRBasicCodedEntry("T-59300", "SRT", "Colon"))); - Codes->insert(OFMake_pair(Duodenum, DSRBasicCodedEntry("T-58200", "SRT", "Duodenum"))); - Codes->insert(OFMake_pair(ElbowJoint, DSRBasicCodedEntry("T-15430", "SRT", "Elbow joint"))); - Codes->insert(OFMake_pair(EntireBody, DSRBasicCodedEntry("T-D0010", "SRT", "Entire body"))); - Codes->insert(OFMake_pair(Esophagus, DSRBasicCodedEntry("T-56000", "SRT", "Esophagus"))); - Codes->insert(OFMake_pair(EsophagusStomachAndDuodenum, DSRBasicCodedEntry("T-DD163", "SRT", "Esophagus, stomach and duodenum"))); - Codes->insert(OFMake_pair(Extremity, DSRBasicCodedEntry("T-D0300", "SRT", "Extremity"))); - Codes->insert(OFMake_pair(Eye, DSRBasicCodedEntry("T-AA000", "SRT", "Eye"))); - Codes->insert(OFMake_pair(EyeRegion, DSRBasicCodedEntry("T-D0801", "SRT", "Eye region"))); - Codes->insert(OFMake_pair(FacialBones, DSRBasicCodedEntry("T-11196", "SRT", "Facial bones"))); - Codes->insert(OFMake_pair(Femur, DSRBasicCodedEntry("T-12710", "SRT", "Femur"))); - Codes->insert(OFMake_pair(Fibula, DSRBasicCodedEntry("T-12750", "SRT", "Fibula"))); - Codes->insert(OFMake_pair(Finger, DSRBasicCodedEntry("T-D8800", "SRT", "Finger"))); - Codes->insert(OFMake_pair(Foot, DSRBasicCodedEntry("T-D9700", "SRT", "Foot"))); - Codes->insert(OFMake_pair(Forearm, DSRBasicCodedEntry("T-D8500", "SRT", "Forearm"))); - Codes->insert(OFMake_pair(Gallbladder, DSRBasicCodedEntry("T-63000", "SRT", "Gallbladder"))); - Codes->insert(OFMake_pair(Hand, DSRBasicCodedEntry("T-D8700", "SRT", "Hand"))); - Codes->insert(OFMake_pair(Head, DSRBasicCodedEntry("T-D1100", "SRT", "Head"))); - Codes->insert(OFMake_pair(HeadAndNeck, DSRBasicCodedEntry("T-D1000", "SRT", "Head and Neck"))); - Codes->insert(OFMake_pair(Heart, DSRBasicCodedEntry("T-32000", "SRT", "Heart"))); - Codes->insert(OFMake_pair(HipJoint, DSRBasicCodedEntry("T-15710", "SRT", "Hip joint"))); - Codes->insert(OFMake_pair(Humerus, DSRBasicCodedEntry("T-12410", "SRT", "Humerus"))); - Codes->insert(OFMake_pair(Ileum, DSRBasicCodedEntry("T-58600", "SRT", "Ileum"))); - Codes->insert(OFMake_pair(Ilium, DSRBasicCodedEntry("T-12340", "SRT", "Ilium"))); - Codes->insert(OFMake_pair(InternalAuditoryCanal, DSRBasicCodedEntry("T-AB959", "SRT", "Internal Auditory Canal"))); - Codes->insert(OFMake_pair(JawRegion, DSRBasicCodedEntry("T-D1213", "SRT", "Jaw region"))); - Codes->insert(OFMake_pair(Jejunum, DSRBasicCodedEntry("T-58400", "SRT", "Jejunum"))); - Codes->insert(OFMake_pair(Knee, DSRBasicCodedEntry("T-D9200", "SRT", "Knee"))); - Codes->insert(OFMake_pair(LargeIntestine, DSRBasicCodedEntry("T-59000", "SRT", "Large intestine"))); - Codes->insert(OFMake_pair(Larynx, DSRBasicCodedEntry("T-24100", "SRT", "Larynx"))); - Codes->insert(OFMake_pair(LowerLeg, DSRBasicCodedEntry("T-D9400", "SRT", "Lower leg"))); - Codes->insert(OFMake_pair(LowerLimb, DSRBasicCodedEntry("T-D9000", "SRT", "Lower limb"))); - Codes->insert(OFMake_pair(LumbarSpine, DSRBasicCodedEntry("T-11503", "SRT", "Lumbar spine"))); - Codes->insert(OFMake_pair(LumboSacralSpine, DSRBasicCodedEntry("T-D00F9", "SRT", "Lumbo-sacral spine"))); - Codes->insert(OFMake_pair(Mandible, DSRBasicCodedEntry("T-11180", "SRT", "Mandible"))); - Codes->insert(OFMake_pair(MastoidBone, DSRBasicCodedEntry("T-11133", "SRT", "Mastoid bone"))); - Codes->insert(OFMake_pair(Maxilla, DSRBasicCodedEntry("T-11170", "SRT", "Maxilla"))); - Codes->insert(OFMake_pair(Mediastinum, DSRBasicCodedEntry("T-D3300", "SRT", "Mediastinum"))); - Codes->insert(OFMake_pair(MuscleOfLowerLimb, DSRBasicCodedEntry("T-14668", "SRT", "Muscle of lower limb"))); - Codes->insert(OFMake_pair(MuscleOfUpperLimb, DSRBasicCodedEntry("T-13600", "SRT", "Muscle of upper limb"))); - Codes->insert(OFMake_pair(NasalBone, DSRBasicCodedEntry("T-11149", "SRT", "Nasal bone"))); - Codes->insert(OFMake_pair(Neck, DSRBasicCodedEntry("T-D1600", "SRT", "Neck"))); - Codes->insert(OFMake_pair(NeckAndChest, DSRBasicCodedEntry("R-FAB52", "SRT", "Neck and Chest"))); - Codes->insert(OFMake_pair(NeckChestAndAbdomen, DSRBasicCodedEntry("R-FAB53", "SRT", "Neck, Chest and Abdomen"))); - Codes->insert(OFMake_pair(NeckChestAbdomenAndPelvis, DSRBasicCodedEntry("R-FAB54", "SRT", "Neck, Chest, Abdomen and Pelvis"))); - Codes->insert(OFMake_pair(OpticCanal, DSRBasicCodedEntry("T-11102", "SRT", "Optic canal"))); - Codes->insert(OFMake_pair(OrbitalStructure, DSRBasicCodedEntry("T-D14AE", "SRT", "Orbital structure"))); - Codes->insert(OFMake_pair(PancreaticDuctAndBileDuctSystems, DSRBasicCodedEntry("T-65600", "SRT", "Pancreatic duct and bile duct systems"))); - Codes->insert(OFMake_pair(ParanasalSinus, DSRBasicCodedEntry("T-22000", "SRT", "Paranasal sinus"))); - Codes->insert(OFMake_pair(ParotidGland, DSRBasicCodedEntry("T-61100", "SRT", "Parotid gland"))); - Codes->insert(OFMake_pair(Patella, DSRBasicCodedEntry("T-12730", "SRT", "Patella"))); - Codes->insert(OFMake_pair(Pelvis, DSRBasicCodedEntry("T-D6000", "SRT", "Pelvis"))); - Codes->insert(OFMake_pair(PelvisAndLowerExtremities, DSRBasicCodedEntry("R-FAB58", "SRT", "Pelvis and lower extremities"))); + Codes->insert(OFMake_pair(Abdomen, DSRBasicCodedEntry("113345001", "SCT", "Abdomen"))); + Codes->insert(OFMake_pair(AbdomenAndPelvis, DSRBasicCodedEntry("416949008", "SCT", "Abdomen and Pelvis"))); + Codes->insert(OFMake_pair(AcromioclavicularJoint, DSRBasicCodedEntry("85856004", "SCT", "Acromioclavicular joint"))); + Codes->insert(OFMake_pair(AnkleJoint, DSRBasicCodedEntry("70258002", "SCT", "Ankle joint"))); + Codes->insert(OFMake_pair(Anus, DSRBasicCodedEntry("53505006", "SCT", "Anus"))); + Codes->insert(OFMake_pair(ApexOfLung, DSRBasicCodedEntry("86598002", "SCT", "Apex of Lung"))); + Codes->insert(OFMake_pair(BileDuct, DSRBasicCodedEntry("28273000", "SCT", "Bile duct"))); + Codes->insert(OFMake_pair(Bladder, DSRBasicCodedEntry("89837001", "SCT", "Bladder"))); + Codes->insert(OFMake_pair(BoneOfLowerLimb, DSRBasicCodedEntry("72001000", "SCT", "Bone of lower limb"))); + Codes->insert(OFMake_pair(BoneOfUpperLimb, DSRBasicCodedEntry("371195002", "SCT", "Bone of upper limb"))); + Codes->insert(OFMake_pair(Breast, DSRBasicCodedEntry("76752008", "SCT", "Breast"))); + Codes->insert(OFMake_pair(Bronchus, DSRBasicCodedEntry("955009", "SCT", "Bronchus"))); + Codes->insert(OFMake_pair(Calcaneus, DSRBasicCodedEntry("80144004", "SCT", "Calcaneus"))); + Codes->insert(OFMake_pair(CervicalSpine, DSRBasicCodedEntry("122494005", "SCT", "Cervical spine"))); + Codes->insert(OFMake_pair(CervicoThoracicSpine, DSRBasicCodedEntry("297171002", "SCT", "Cervico-thoracic spine"))); + Codes->insert(OFMake_pair(Chest, DSRBasicCodedEntry("51185008", "SCT", "Chest"))); + Codes->insert(OFMake_pair(ChestAndAbdomen, DSRBasicCodedEntry("416550000", "SCT", "Chest and Abdomen"))); + Codes->insert(OFMake_pair(ChestAbdomenAndPelvis, DSRBasicCodedEntry("416775004", "SCT", "Chest, Abdomen and Pelvis"))); + Codes->insert(OFMake_pair(Clavicle, DSRBasicCodedEntry("51299004", "SCT", "Clavicle"))); + Codes->insert(OFMake_pair(Coccyx, DSRBasicCodedEntry("64688005", "SCT", "Coccyx"))); + Codes->insert(OFMake_pair(Colon, DSRBasicCodedEntry("71854001", "SCT", "Colon"))); + Codes->insert(OFMake_pair(Duodenum, DSRBasicCodedEntry("38848004", "SCT", "Duodenum"))); + Codes->insert(OFMake_pair(ElbowJoint, DSRBasicCodedEntry("16953009", "SCT", "Elbow joint"))); + Codes->insert(OFMake_pair(EntireBody, DSRBasicCodedEntry("38266002", "SCT", "Entire body"))); + Codes->insert(OFMake_pair(Esophagus, DSRBasicCodedEntry("32849002", "SCT", "Esophagus"))); + Codes->insert(OFMake_pair(EsophagusStomachAndDuodenum, DSRBasicCodedEntry("110861005", "SCT", "Esophagus, stomach and duodenum"))); + Codes->insert(OFMake_pair(Extremity, DSRBasicCodedEntry("66019005", "SCT", "Extremity"))); + Codes->insert(OFMake_pair(Eye, DSRBasicCodedEntry("81745001", "SCT", "Eye"))); + Codes->insert(OFMake_pair(EyeRegion, DSRBasicCodedEntry("371398005", "SCT", "Eye region"))); + Codes->insert(OFMake_pair(FacialBones, DSRBasicCodedEntry("91397008", "SCT", "Facial bones"))); + Codes->insert(OFMake_pair(Femur, DSRBasicCodedEntry("71341001", "SCT", "Femur"))); + Codes->insert(OFMake_pair(Fibula, DSRBasicCodedEntry("87342007", "SCT", "Fibula"))); + Codes->insert(OFMake_pair(Finger, DSRBasicCodedEntry("7569003", "SCT", "Finger"))); + Codes->insert(OFMake_pair(Foot, DSRBasicCodedEntry("56459004", "SCT", "Foot"))); + Codes->insert(OFMake_pair(Forearm, DSRBasicCodedEntry("14975008", "SCT", "Forearm"))); + Codes->insert(OFMake_pair(Gallbladder, DSRBasicCodedEntry("28231008", "SCT", "Gallbladder"))); + Codes->insert(OFMake_pair(Hand, DSRBasicCodedEntry("85562004", "SCT", "Hand"))); + Codes->insert(OFMake_pair(Head, DSRBasicCodedEntry("69536005", "SCT", "Head"))); + Codes->insert(OFMake_pair(HeadAndNeck, DSRBasicCodedEntry("774007", "SCT", "Head and Neck"))); + Codes->insert(OFMake_pair(Heart, DSRBasicCodedEntry("80891009", "SCT", "Heart"))); + Codes->insert(OFMake_pair(HipJoint, DSRBasicCodedEntry("29836001", "SCT", "Hip joint"))); + Codes->insert(OFMake_pair(Humerus, DSRBasicCodedEntry("85050009", "SCT", "Humerus"))); + Codes->insert(OFMake_pair(Ileum, DSRBasicCodedEntry("34516001", "SCT", "Ileum"))); + Codes->insert(OFMake_pair(Ilium, DSRBasicCodedEntry("22356005", "SCT", "Ilium"))); + Codes->insert(OFMake_pair(InternalAuditoryCanal, DSRBasicCodedEntry("361078006", "SCT", "Internal Auditory Canal"))); + Codes->insert(OFMake_pair(JawRegion, DSRBasicCodedEntry("661005", "SCT", "Jaw region"))); + Codes->insert(OFMake_pair(Jejunum, DSRBasicCodedEntry("21306003", "SCT", "Jejunum"))); + Codes->insert(OFMake_pair(Knee, DSRBasicCodedEntry("72696002", "SCT", "Knee"))); + Codes->insert(OFMake_pair(LargeIntestine, DSRBasicCodedEntry("14742008", "SCT", "Large intestine"))); + Codes->insert(OFMake_pair(Larynx, DSRBasicCodedEntry("4596009", "SCT", "Larynx"))); + Codes->insert(OFMake_pair(LowerLeg, DSRBasicCodedEntry("30021000", "SCT", "Lower leg"))); + Codes->insert(OFMake_pair(LowerLimb, DSRBasicCodedEntry("61685007", "SCT", "Lower limb"))); + Codes->insert(OFMake_pair(LumbarSpine, DSRBasicCodedEntry("122496007", "SCT", "Lumbar spine"))); + Codes->insert(OFMake_pair(LumboSacralSpine, DSRBasicCodedEntry("297173004", "SCT", "Lumbo-sacral spine"))); + Codes->insert(OFMake_pair(Mandible, DSRBasicCodedEntry("91609006", "SCT", "Mandible"))); + Codes->insert(OFMake_pair(MastoidBone, DSRBasicCodedEntry("59066005", "SCT", "Mastoid bone"))); + Codes->insert(OFMake_pair(Maxilla, DSRBasicCodedEntry("70925003", "SCT", "Maxilla"))); + Codes->insert(OFMake_pair(Mediastinum, DSRBasicCodedEntry("72410000", "SCT", "Mediastinum"))); + Codes->insert(OFMake_pair(MuscleOfLowerLimb, DSRBasicCodedEntry("102292000", "SCT", "Muscle of lower limb"))); + Codes->insert(OFMake_pair(MuscleOfUpperLimb, DSRBasicCodedEntry("30608006", "SCT", "Muscle of upper limb"))); + Codes->insert(OFMake_pair(NasalBone, DSRBasicCodedEntry("74386004", "SCT", "Nasal bone"))); + Codes->insert(OFMake_pair(Neck, DSRBasicCodedEntry("45048000", "SCT", "Neck"))); + Codes->insert(OFMake_pair(NeckAndChest, DSRBasicCodedEntry("417437006", "SCT", "Neck and Chest"))); + Codes->insert(OFMake_pair(NeckChestAndAbdomen, DSRBasicCodedEntry("416152001", "SCT", "Neck, Chest and Abdomen"))); + Codes->insert(OFMake_pair(NeckChestAbdomenAndPelvis, DSRBasicCodedEntry("416319003", "SCT", "Neck, Chest, Abdomen and Pelvis"))); + Codes->insert(OFMake_pair(OpticCanal, DSRBasicCodedEntry("55024004", "SCT", "Optic canal"))); + Codes->insert(OFMake_pair(OrbitalStructure, DSRBasicCodedEntry("363654007", "SCT", "Orbital structure"))); + Codes->insert(OFMake_pair(PancreaticDuctAndBileDuctSystems, DSRBasicCodedEntry("110621006", "SCT", "Pancreatic duct and bile duct systems"))); + Codes->insert(OFMake_pair(ParanasalSinus, DSRBasicCodedEntry("2095001", "SCT", "Paranasal sinus"))); + Codes->insert(OFMake_pair(ParotidGland, DSRBasicCodedEntry("45289007", "SCT", "Parotid gland"))); + Codes->insert(OFMake_pair(Patella, DSRBasicCodedEntry("64234005", "SCT", "Patella"))); + Codes->insert(OFMake_pair(Pelvis, DSRBasicCodedEntry("12921003", "SCT", "Pelvis"))); + Codes->insert(OFMake_pair(PelvisAndLowerExtremities, DSRBasicCodedEntry("416631005", "SCT", "Pelvis and lower extremities"))); Codes->insert(OFMake_pair(Phantom, DSRBasicCodedEntry("113681", "DCM", "Phantom"))); - Codes->insert(OFMake_pair(Prostate, DSRBasicCodedEntry("T-92000", "SRT", "Prostate"))); - Codes->insert(OFMake_pair(Rectum, DSRBasicCodedEntry("T-59600", "SRT", "Rectum"))); - Codes->insert(OFMake_pair(Rib, DSRBasicCodedEntry("T-11300", "SRT", "Rib"))); - Codes->insert(OFMake_pair(SacroiliacJoint, DSRBasicCodedEntry("T-15680", "SRT", "Sacroiliac joint"))); - Codes->insert(OFMake_pair(Sacrum, DSRBasicCodedEntry("T-11AD0", "SRT", "Sacrum"))); - Codes->insert(OFMake_pair(Scapula, DSRBasicCodedEntry("T-12280", "SRT", "Scapula"))); - Codes->insert(OFMake_pair(SellaTurcica, DSRBasicCodedEntry("T-D1460", "SRT", "Sella turcica"))); - Codes->insert(OFMake_pair(SesamoidBonesOfFoot, DSRBasicCodedEntry("T-12980", "SRT", "Sesamoid bones of foot"))); - Codes->insert(OFMake_pair(Shoulder, DSRBasicCodedEntry("T-D2220", "SRT", "Shoulder"))); - Codes->insert(OFMake_pair(Skull, DSRBasicCodedEntry("T-11100", "SRT", "Skull"))); - Codes->insert(OFMake_pair(SmallIntestine, DSRBasicCodedEntry("T-58000", "SRT", "Small intestine"))); - Codes->insert(OFMake_pair(Spine, DSRBasicCodedEntry("T-D04FF", "SRT", "Spine"))); - Codes->insert(OFMake_pair(SternoclavicularJoint, DSRBasicCodedEntry("T-15610", "SRT", "Sternoclavicular joint"))); - Codes->insert(OFMake_pair(Sternum, DSRBasicCodedEntry("T-11210", "SRT", "Sternum"))); - Codes->insert(OFMake_pair(Stomach, DSRBasicCodedEntry("T-57000", "SRT", "Stomach"))); - Codes->insert(OFMake_pair(SubmandibularGland, DSRBasicCodedEntry("T-61300", "SRT", "Submandibular gland"))); - Codes->insert(OFMake_pair(TarsalJoint, DSRBasicCodedEntry("T-15770", "SRT", "Tarsal joint"))); - Codes->insert(OFMake_pair(TemporomandibularJoint, DSRBasicCodedEntry("T-15290", "SRT", "Temporomandibular joint"))); - Codes->insert(OFMake_pair(Thigh, DSRBasicCodedEntry("T-D9100", "SRT", "Thigh"))); - Codes->insert(OFMake_pair(ThoracicSpine, DSRBasicCodedEntry("T-11502", "SRT", "Thoracic spine"))); - Codes->insert(OFMake_pair(ThoracoLumbarSpine, DSRBasicCodedEntry("T-D00F8", "SRT", "Thoraco-lumbar spine"))); - Codes->insert(OFMake_pair(Thumb, DSRBasicCodedEntry("T-D8810", "SRT", "Thumb"))); - Codes->insert(OFMake_pair(Toe, DSRBasicCodedEntry("T-D9800", "SRT", "Toe"))); - Codes->insert(OFMake_pair(Trachea, DSRBasicCodedEntry("T-25000", "SRT", "Trachea"))); - Codes->insert(OFMake_pair(UpperArm, DSRBasicCodedEntry("T-D8200", "SRT", "Upper arm"))); - Codes->insert(OFMake_pair(UpperLimb, DSRBasicCodedEntry("T-D8000", "SRT", "Upper limb"))); - Codes->insert(OFMake_pair(UpperUrinaryTract, DSRBasicCodedEntry("T-7000B", "SRT", "Upper urinary tract"))); - Codes->insert(OFMake_pair(Ureter, DSRBasicCodedEntry("T-73000", "SRT", "Ureter"))); - Codes->insert(OFMake_pair(Urethra, DSRBasicCodedEntry("T-75000", "SRT", "Urethra"))); - Codes->insert(OFMake_pair(UterusAndFallopianTubes, DSRBasicCodedEntry("T-88920", "SRT", "Uterus and fallopian tubes"))); - Codes->insert(OFMake_pair(VertebralColumnAndCranium, DSRBasicCodedEntry("T-11011", "SRT", "Vertebral column and cranium"))); - Codes->insert(OFMake_pair(WristJoint, DSRBasicCodedEntry("T-15460", "SRT", "Wrist joint"))); - Codes->insert(OFMake_pair(Zygoma, DSRBasicCodedEntry("T-11166", "SRT", "Zygoma"))); + Codes->insert(OFMake_pair(Prostate, DSRBasicCodedEntry("41216001", "SCT", "Prostate"))); + Codes->insert(OFMake_pair(Rectum, DSRBasicCodedEntry("34402009", "SCT", "Rectum"))); + Codes->insert(OFMake_pair(Rib, DSRBasicCodedEntry("113197003", "SCT", "Rib"))); + Codes->insert(OFMake_pair(SacroiliacJoint, DSRBasicCodedEntry("39723000", "SCT", "Sacroiliac joint"))); + Codes->insert(OFMake_pair(Sacrum, DSRBasicCodedEntry("54735007", "SCT", "Sacrum"))); + Codes->insert(OFMake_pair(Scapula, DSRBasicCodedEntry("79601000", "SCT", "Scapula"))); + Codes->insert(OFMake_pair(SellaTurcica, DSRBasicCodedEntry("42575006", "SCT", "Sella turcica"))); + Codes->insert(OFMake_pair(SesamoidBonesOfFoot, DSRBasicCodedEntry("58742003", "SCT", "Sesamoid bones of foot"))); + Codes->insert(OFMake_pair(Shoulder, DSRBasicCodedEntry("16982005", "SCT", "Shoulder"))); + Codes->insert(OFMake_pair(Skull, DSRBasicCodedEntry("89546000", "SCT", "Skull"))); + Codes->insert(OFMake_pair(SmallIntestine, DSRBasicCodedEntry("30315005", "SCT", "Small intestine"))); + Codes->insert(OFMake_pair(Spine, DSRBasicCodedEntry("421060004", "SCT", "Spine"))); + Codes->insert(OFMake_pair(SternoclavicularJoint, DSRBasicCodedEntry("7844006", "SCT", "Sternoclavicular joint"))); + Codes->insert(OFMake_pair(Sternum, DSRBasicCodedEntry("56873002", "SCT", "Sternum"))); + Codes->insert(OFMake_pair(Stomach, DSRBasicCodedEntry("69695003", "SCT", "Stomach"))); + Codes->insert(OFMake_pair(SubmandibularGland, DSRBasicCodedEntry("54019009", "SCT", "Submandibular gland"))); + Codes->insert(OFMake_pair(TarsalJoint, DSRBasicCodedEntry("27949001", "SCT", "Tarsal joint"))); + Codes->insert(OFMake_pair(TemporomandibularJoint, DSRBasicCodedEntry("53620006", "SCT", "Temporomandibular joint"))); + Codes->insert(OFMake_pair(Thigh, DSRBasicCodedEntry("68367000", "SCT", "Thigh"))); + Codes->insert(OFMake_pair(ThoracicSpine, DSRBasicCodedEntry("122495006", "SCT", "Thoracic spine"))); + Codes->insert(OFMake_pair(ThoracoLumbarSpine, DSRBasicCodedEntry("297172009", "SCT", "Thoraco-lumbar spine"))); + Codes->insert(OFMake_pair(Thumb, DSRBasicCodedEntry("76505004", "SCT", "Thumb"))); + Codes->insert(OFMake_pair(Toe, DSRBasicCodedEntry("29707007", "SCT", "Toe"))); + Codes->insert(OFMake_pair(Trachea, DSRBasicCodedEntry("44567001", "SCT", "Trachea"))); + Codes->insert(OFMake_pair(UpperArm, DSRBasicCodedEntry("40983000", "SCT", "Upper arm"))); + Codes->insert(OFMake_pair(UpperLimb, DSRBasicCodedEntry("53120007", "SCT", "Upper limb"))); + Codes->insert(OFMake_pair(UpperUrinaryTract, DSRBasicCodedEntry("431491007", "SCT", "Upper urinary tract"))); + Codes->insert(OFMake_pair(Ureter, DSRBasicCodedEntry("87953007", "SCT", "Ureter"))); + Codes->insert(OFMake_pair(Urethra, DSRBasicCodedEntry("13648007", "SCT", "Urethra"))); + Codes->insert(OFMake_pair(UterusAndFallopianTubes, DSRBasicCodedEntry("110639002", "SCT", "Uterus and fallopian tubes"))); + Codes->insert(OFMake_pair(VertebralColumnAndCranium, DSRBasicCodedEntry("110517009", "SCT", "Vertebral column and cranium"))); + Codes->insert(OFMake_pair(WristJoint, DSRBasicCodedEntry("74670003", "SCT", "Wrist joint"))); + Codes->insert(OFMake_pair(Zygoma, DSRBasicCodedEntry("13881006", "SCT", "Zygoma"))); } /* should never be NULL */ return *Codes; diff --git a/dcmsr/libcmr/cid42.cc b/dcmsr/libcmr/cid42.cc index b943f33d..578937ea 100644 --- a/dcmsr/libcmr/cid42.cc +++ b/dcmsr/libcmr/cid42.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID42_NumericValueQualifier * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:10 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:12 by J. Riesmeier * */ diff --git a/dcmsr/libcmr/cid6147.cc b/dcmsr/libcmr/cid6147.cc index 7b1551b6..1e69fee1 100644 --- a/dcmsr/libcmr/cid6147.cc +++ b/dcmsr/libcmr/cid6147.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID6147_ResponseCriteria * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:21 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:24 by J. Riesmeier * */ diff --git a/dcmsr/libcmr/cid7021.cc b/dcmsr/libcmr/cid7021.cc index 13379edc..e78cf01e 100644 --- a/dcmsr/libcmr/cid7021.cc +++ b/dcmsr/libcmr/cid7021.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID7021_MeasurementReportDocumentTitles * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:22 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:26 by J. Riesmeier * */ diff --git a/dcmsr/libcmr/cid7181.cc b/dcmsr/libcmr/cid7181.cc index f7607799..294a9e7e 100644 --- a/dcmsr/libcmr/cid7181.cc +++ b/dcmsr/libcmr/cid7181.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID7181_AbstractMultiDimensionalImageModelComponentUnits * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:24 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:28 by J. Riesmeier * */ diff --git a/dcmsr/libcmr/cid7445.cc b/dcmsr/libcmr/cid7445.cc index a356a449..62348b91 100644 --- a/dcmsr/libcmr/cid7445.cc +++ b/dcmsr/libcmr/cid7445.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID7445_DeviceParticipatingRoles * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:26 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:30 by J. Riesmeier * */ diff --git a/dcmsr/libcmr/cid7452.cc b/dcmsr/libcmr/cid7452.cc index 2a0aec2f..86daa4f8 100644 --- a/dcmsr/libcmr/cid7452.cc +++ b/dcmsr/libcmr/cid7452.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID7452_OrganizationalRoles * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:28 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:32 by J. Riesmeier * */ @@ -149,28 +149,28 @@ CID7452_OrganizationalRoles::CodeList &CID7452_OrganizationalRoles::getCodes() /* create a new code list (should never fail) */ Codes = new CodeList(); /* and initialize it by adding the coded entries */ - Codes->insert(OFMake_pair(MedicalPractitioner, DSRBasicCodedEntry("J-0016E", "SRT", "Medical Practitioner"))); - Codes->insert(OFMake_pair(Physician, DSRBasicCodedEntry("J-004E8", "SRT", "Physician"))); + Codes->insert(OFMake_pair(MedicalPractitioner, DSRBasicCodedEntry("158965000", "SCT", "Medical Practitioner"))); + Codes->insert(OFMake_pair(Physician, DSRBasicCodedEntry("309343006", "SCT", "Physician"))); Codes->insert(OFMake_pair(HeadOfRadiology, DSRBasicCodedEntry("128670", "DCM", "Head of Radiology"))); Codes->insert(OFMake_pair(ChairOfProtocolCommittee, DSRBasicCodedEntry("128671", "DCM", "Chair of Protocol Committee"))); Codes->insert(OFMake_pair(RepresentativeOfProtocolCommittee, DSRBasicCodedEntry("128676", "DCM", "Representative of Protocol Committee"))); Codes->insert(OFMake_pair(RepresentativeOfEthicsCommittee, DSRBasicCodedEntry("128677", "DCM", "Representative of Ethics Committee"))); Codes->insert(OFMake_pair(HeadOfCardiology, DSRBasicCodedEntry("128675", "DCM", "Head of Cardiology"))); Codes->insert(OFMake_pair(AdministratorOfRadiologyDepartment, DSRBasicCodedEntry("128673", "DCM", "Administrator of Radiology Department"))); - Codes->insert(OFMake_pair(Nurse, DSRBasicCodedEntry("J-07100", "SRT", "Nurse"))); - Codes->insert(OFMake_pair(RadiologicTechnologist, DSRBasicCodedEntry("J-00187", "SRT", "Radiologic Technologist"))); + Codes->insert(OFMake_pair(Nurse, DSRBasicCodedEntry("106292003", "SCT", "Nurse"))); + Codes->insert(OFMake_pair(RadiologicTechnologist, DSRBasicCodedEntry("159016003", "SCT", "Radiologic Technologist"))); Codes->insert(OFMake_pair(LeadRadiologicTechnologist, DSRBasicCodedEntry("128674", "DCM", "Lead Radiologic Technologist"))); - Codes->insert(OFMake_pair(RadiationTherapist, DSRBasicCodedEntry("J-06173", "SRT", "Radiation Therapist"))); - Codes->insert(OFMake_pair(Radiographer, DSRBasicCodedEntry("J-00187", "SRT", "Radiographer"))); + Codes->insert(OFMake_pair(RadiationTherapist, DSRBasicCodedEntry("3430008", "SCT", "Radiation Therapist"))); + Codes->insert(OFMake_pair(Radiographer, DSRBasicCodedEntry("159016003", "SCT", "Radiographer"))); Codes->insert(OFMake_pair(Intern, DSRBasicCodedEntry("C1144859", "UMLS", "Intern"))); - Codes->insert(OFMake_pair(Resident, DSRBasicCodedEntry("J-005E6", "SRT", "Resident"))); - Codes->insert(OFMake_pair(Registrar, DSRBasicCodedEntry("J-00172", "SRT", "Registrar"))); + Codes->insert(OFMake_pair(Resident, DSRBasicCodedEntry("405277009", "SCT", "Resident"))); + Codes->insert(OFMake_pair(Registrar, DSRBasicCodedEntry("158971006", "SCT", "Registrar"))); Codes->insert(OFMake_pair(Fellow, DSRBasicCodedEntry("121088", "DCM", "Fellow"))); - Codes->insert(OFMake_pair(Attending, DSRBasicCodedEntry("J-005E8", "SRT", "Attending"))); - Codes->insert(OFMake_pair(Consultant, DSRBasicCodedEntry("J-0050A", "SRT", "Consultant"))); + Codes->insert(OFMake_pair(Attending, DSRBasicCodedEntry("405279007", "SCT", "Attending"))); + Codes->insert(OFMake_pair(Consultant, DSRBasicCodedEntry("309390008", "SCT", "Consultant"))); Codes->insert(OFMake_pair(ConsultingPhysician, DSRBasicCodedEntry("C1441532", "UMLS", "Consulting Physician"))); - Codes->insert(OFMake_pair(ScrubNurse, DSRBasicCodedEntry("J-0714A", "SRT", "Scrub nurse"))); - Codes->insert(OFMake_pair(Surgeon, DSRBasicCodedEntry("J-00556", "SRT", "Surgeon"))); + Codes->insert(OFMake_pair(ScrubNurse, DSRBasicCodedEntry("415506007", "SCT", "Scrub nurse"))); + Codes->insert(OFMake_pair(Surgeon, DSRBasicCodedEntry("304292004", "SCT", "Surgeon"))); Codes->insert(OFMake_pair(Sonologist, DSRBasicCodedEntry("121092", "DCM", "Sonologist"))); Codes->insert(OFMake_pair(Sonographer, DSRBasicCodedEntry("C1954848", "UMLS", "Sonographer"))); Codes->insert(OFMake_pair(RadiationPhysicist, DSRBasicCodedEntry("C2985483", "UMLS", "Radiation Physicist"))); diff --git a/dcmsr/libcmr/cid7453.cc b/dcmsr/libcmr/cid7453.cc index 1e41fcdd..4487988b 100644 --- a/dcmsr/libcmr/cid7453.cc +++ b/dcmsr/libcmr/cid7453.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID7453_PerformingRoles * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:29 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:33 by J. Riesmeier * */ @@ -155,7 +155,7 @@ CID7453_PerformingRoles::CodeList &CID7453_PerformingRoles::getCodes() Codes->insert(OFMake_pair(Recording, DSRBasicCodedEntry("121097", "DCM", "Recording"))); Codes->insert(OFMake_pair(Verifying, DSRBasicCodedEntry("121098", "DCM", "Verifying"))); Codes->insert(OFMake_pair(Assisting, DSRBasicCodedEntry("121099", "DCM", "Assisting"))); - Codes->insert(OFMake_pair(CirculatingNurse, DSRBasicCodedEntry("J-0714B", "SRT", "Circulating Nurse"))); + Codes->insert(OFMake_pair(CirculatingNurse, DSRBasicCodedEntry("413854007", "SCT", "Circulating Nurse"))); Codes->insert(OFMake_pair(Standby, DSRBasicCodedEntry("121101", "DCM", "Standby"))); Codes->insert(OFMake_pair(IrradiationAuthorizing, DSRBasicCodedEntry("113850", "DCM", "Irradiation Authorizing"))); Codes->insert(OFMake_pair(IrradiationAdministering, DSRBasicCodedEntry("113851", "DCM", "Irradiation Administering"))); diff --git a/dcmsr/libcmr/cid7464.cc b/dcmsr/libcmr/cid7464.cc index d39d1b54..a7e1c6d1 100644 --- a/dcmsr/libcmr/cid7464.cc +++ b/dcmsr/libcmr/cid7464.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID7464_GeneralRegionOfInterestMeasurementModifiers * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:31 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:35 by J. Riesmeier * */ @@ -149,13 +149,13 @@ CID7464_GeneralRegionOfInterestMeasurementModifiers::CodeList &CID7464_GeneralRe /* create a new code list (should never fail) */ Codes = new CodeList(); /* and initialize it by adding the coded entries */ - Codes->insert(OFMake_pair(Maximum, DSRBasicCodedEntry("G-A437", "SRT", "Maximum"))); - Codes->insert(OFMake_pair(Minimum, DSRBasicCodedEntry("R-404FB", "SRT", "Minimum"))); - Codes->insert(OFMake_pair(Mean, DSRBasicCodedEntry("R-00317", "SRT", "Mean"))); - Codes->insert(OFMake_pair(StandardDeviation, DSRBasicCodedEntry("R-10047", "SRT", "Standard Deviation"))); - Codes->insert(OFMake_pair(Total, DSRBasicCodedEntry("R-40507", "SRT", "Total"))); - Codes->insert(OFMake_pair(Median, DSRBasicCodedEntry("R-00319", "SRT", "Median"))); - Codes->insert(OFMake_pair(Mode, DSRBasicCodedEntry("R-0032E", "SRT", "Mode"))); + Codes->insert(OFMake_pair(Maximum, DSRBasicCodedEntry("56851009", "SCT", "Maximum"))); + Codes->insert(OFMake_pair(Minimum, DSRBasicCodedEntry("255605001", "SCT", "Minimum"))); + Codes->insert(OFMake_pair(Mean, DSRBasicCodedEntry("373098007", "SCT", "Mean"))); + Codes->insert(OFMake_pair(StandardDeviation, DSRBasicCodedEntry("386136009", "SCT", "Standard Deviation"))); + Codes->insert(OFMake_pair(Total, DSRBasicCodedEntry("255619001", "SCT", "Total"))); + Codes->insert(OFMake_pair(Median, DSRBasicCodedEntry("373099004", "SCT", "Median"))); + Codes->insert(OFMake_pair(Mode, DSRBasicCodedEntry("373100007", "SCT", "Mode"))); Codes->insert(OFMake_pair(PeakValueWithinROI, DSRBasicCodedEntry("126031", "DCM", "Peak Value Within ROI"))); Codes->insert(OFMake_pair(CoefficientOfVariance, DSRBasicCodedEntry("C0681921", "UMLS", "Coefficient of Variance"))); Codes->insert(OFMake_pair(Skewness, DSRBasicCodedEntry("126051", "DCM", "Skewness"))); diff --git a/dcmsr/libcmr/cid7469.cc b/dcmsr/libcmr/cid7469.cc index d8eba1e8..e47123a7 100644 --- a/dcmsr/libcmr/cid7469.cc +++ b/dcmsr/libcmr/cid7469.cc @@ -1,12 +1,12 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class CID7469_GenericIntensityAndSizeMeasurements * - * Generated automatically from DICOM PS 3.16-2018d - * File created on 2018-09-27 16:57:33 by J. Riesmeier + * Generated automatically from DICOM PS 3.16-2019b + * File created on 2019-04-26 17:15:37 by J. Riesmeier * */ @@ -149,18 +149,18 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA /* create a new code list (should never fail) */ Codes = new CodeList(); /* and initialize it by adding the coded entries */ - Codes->insert(OFMake_pair(NAcetylaspartate, DSRBasicCodedEntry("F-65C50", "SRT", "N-acetylaspartate"))); - Codes->insert(OFMake_pair(Citrate, DSRBasicCodedEntry("F-61080", "SRT", "Citrate"))); - Codes->insert(OFMake_pair(Choline, DSRBasicCodedEntry("F-61620", "SRT", "Choline"))); - Codes->insert(OFMake_pair(Creatine, DSRBasicCodedEntry("F-61380", "SRT", "Creatine"))); + Codes->insert(OFMake_pair(NAcetylaspartate, DSRBasicCodedEntry("115391007", "SCT", "N-acetylaspartate"))); + Codes->insert(OFMake_pair(Citrate, DSRBasicCodedEntry("59351004", "SCT", "Citrate"))); + Codes->insert(OFMake_pair(Choline, DSRBasicCodedEntry("65123005", "SCT", "Choline"))); + Codes->insert(OFMake_pair(Creatine, DSRBasicCodedEntry("14804005", "SCT", "Creatine"))); Codes->insert(OFMake_pair(CreatineAndCholine, DSRBasicCodedEntry("113094", "DCM", "Creatine and Choline"))); - Codes->insert(OFMake_pair(Lactate, DSRBasicCodedEntry("F-61760", "SRT", "Lactate"))); - Codes->insert(OFMake_pair(Lipid, DSRBasicCodedEntry("F-63600", "SRT", "Lipid"))); + Codes->insert(OFMake_pair(Lactate, DSRBasicCodedEntry("83036002", "SCT", "Lactate"))); + Codes->insert(OFMake_pair(Lipid, DSRBasicCodedEntry("70106000", "SCT", "Lipid"))); Codes->insert(OFMake_pair(LipidAndLactate, DSRBasicCodedEntry("113095", "DCM", "Lipid and Lactate"))); Codes->insert(OFMake_pair(GlutamateAndGlutamine, DSRBasicCodedEntry("113080", "DCM", "Glutamate and glutamine"))); - Codes->insert(OFMake_pair(Glutamine, DSRBasicCodedEntry("F-64210", "SRT", "Glutamine"))); - Codes->insert(OFMake_pair(Tuarine, DSRBasicCodedEntry("F-64460", "SRT", "Tuarine"))); - Codes->insert(OFMake_pair(Inositol, DSRBasicCodedEntry("F-61A90", "SRT", "Inositol"))); + Codes->insert(OFMake_pair(Glutamine, DSRBasicCodedEntry("25761002", "SCT", "Glutamine"))); + Codes->insert(OFMake_pair(Tuarine, DSRBasicCodedEntry("10944007", "SCT", "Tuarine"))); + Codes->insert(OFMake_pair(Inositol, DSRBasicCodedEntry("72164009", "SCT", "Inositol"))); Codes->insert(OFMake_pair(CholinePerCreatineRatio, DSRBasicCodedEntry("113081", "DCM", "Choline/Creatine Ratio"))); Codes->insert(OFMake_pair(NAcetylaspartatePerCreatineRatio, DSRBasicCodedEntry("113082", "DCM", "N-acetylaspartate/Creatine Ratio"))); Codes->insert(OFMake_pair(NAcetylaspartatePerCholineRatio, DSRBasicCodedEntry("113083", "DCM", "N-acetylaspartate/Choline Ratio"))); @@ -215,7 +215,7 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA Codes->insert(OFMake_pair(AttenuationCoefficient, DSRBasicCodedEntry("112031", "DCM", "Attenuation Coefficient"))); Codes->insert(OFMake_pair(TissueVelocity, DSRBasicCodedEntry("110827", "DCM", "Tissue Velocity"))); Codes->insert(OFMake_pair(FlowVelocity, DSRBasicCodedEntry("110828", "DCM", "Flow Velocity"))); - Codes->insert(OFMake_pair(PowerDoppler, DSRBasicCodedEntry("P0-02241", "SRT", "Power Doppler"))); + Codes->insert(OFMake_pair(PowerDoppler, DSRBasicCodedEntry("425704008", "SCT", "Power Doppler"))); Codes->insert(OFMake_pair(FlowVariance, DSRBasicCodedEntry("110829", "DCM", "Flow Variance"))); Codes->insert(OFMake_pair(Elasticity, DSRBasicCodedEntry("110830", "DCM", "Elasticity"))); Codes->insert(OFMake_pair(Perfusion, DSRBasicCodedEntry("110831", "DCM", "Perfusion"))); @@ -260,10 +260,10 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA Codes->insert(OFMake_pair(Ve, DSRBasicCodedEntry("126314", "DCM", "ve"))); Codes->insert(OFMake_pair(Tau_m, DSRBasicCodedEntry("126330", "DCM", "tau_m"))); Codes->insert(OFMake_pair(Vp, DSRBasicCodedEntry("126331", "DCM", "vp"))); - Codes->insert(OFMake_pair(RegionalCerebralBloodFlow, DSRBasicCodedEntry("113055", "DCM", "Regional Cerebral Blood Flow"))); - Codes->insert(OFMake_pair(RegionalBloodFlow, DSRBasicCodedEntry("126390", "DCM", "Regional Blood Flow"))); - Codes->insert(OFMake_pair(RegionalCerebralBloodVolume, DSRBasicCodedEntry("113056", "DCM", "Regional Cerebral Blood Volume"))); - Codes->insert(OFMake_pair(RegionalBloodVolume, DSRBasicCodedEntry("126391", "DCM", "Regional Blood Volume"))); + Codes->insert(OFMake_pair(AbsoluteRegionalBloodFlow, DSRBasicCodedEntry("126390", "DCM", "Absolute Regional Blood Flow"))); + Codes->insert(OFMake_pair(AbsoluteRegionalBloodVolume, DSRBasicCodedEntry("126391", "DCM", "Absolute Regional Blood Volume"))); + Codes->insert(OFMake_pair(RelativeRegionalBloodFlow, DSRBasicCodedEntry("126397", "DCM", "Relative Regional Blood Flow"))); + Codes->insert(OFMake_pair(RelativeRegionalBloodVolume, DSRBasicCodedEntry("126398", "DCM", "Relative Regional Blood Volume"))); Codes->insert(OFMake_pair(MeanTransitTime, DSRBasicCodedEntry("113052", "DCM", "Mean Transit Time"))); Codes->insert(OFMake_pair(TimeToPeak, DSRBasicCodedEntry("113069", "DCM", "Time To Peak"))); Codes->insert(OFMake_pair(OxygenExtractionFraction, DSRBasicCodedEntry("126392", "DCM", "Oxygen Extraction Fraction"))); @@ -292,7 +292,7 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA Codes->insert(OFMake_pair(SUVibw, DSRBasicCodedEntry("126404", "DCM", "SUVibw"))); Codes->insert(OFMake_pair(AbsorbedDose, DSRBasicCodedEntry("128513", "DCM", "Absorbed Dose"))); Codes->insert(OFMake_pair(EquivalentDose, DSRBasicCodedEntry("128512", "DCM", "Equivalent Dose"))); - Codes->insert(OFMake_pair(Fat, DSRBasicCodedEntry("T-D008A", "SRT", "Fat"))); + Codes->insert(OFMake_pair(Fat, DSRBasicCodedEntry("256674009", "SCT", "Fat"))); Codes->insert(OFMake_pair(FatFraction, DSRBasicCodedEntry("129100", "DCM", "Fat fraction"))); Codes->insert(OFMake_pair(WaterPerFatInPhase, DSRBasicCodedEntry("129101", "DCM", "Water/fat in phase"))); Codes->insert(OFMake_pair(WaterPerFatOutOfPhase, DSRBasicCodedEntry("129102", "DCM", "Water/fat out of phase"))); @@ -300,27 +300,33 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA Codes->insert(OFMake_pair(SignalChange, DSRBasicCodedEntry("113059", "DCM", "Signal change"))); Codes->insert(OFMake_pair(SignalToNoise, DSRBasicCodedEntry("113060", "DCM", "Signal to noise"))); Codes->insert(OFMake_pair(TimeCourseOfSignal, DSRBasicCodedEntry("113066", "DCM", "Time course of signal"))); - Codes->insert(OFMake_pair(Water, DSRBasicCodedEntry("C-10120", "SRT", "Water"))); + Codes->insert(OFMake_pair(Water, DSRBasicCodedEntry("11713004", "SCT", "Water"))); Codes->insert(OFMake_pair(WaterFraction, DSRBasicCodedEntry("129103", "DCM", "Water fraction"))); - Codes->insert(OFMake_pair(Length, DSRBasicCodedEntry("G-D7FE", "SRT", "Length"))); + Codes->insert(OFMake_pair(RelativeLinearStoppingPower, DSRBasicCodedEntry("130086", "DCM", "Relative Linear Stopping Power"))); + Codes->insert(OFMake_pair(Length, DSRBasicCodedEntry("410668003", "SCT", "Length"))); Codes->insert(OFMake_pair(PathLength, DSRBasicCodedEntry("121211", "DCM", "Path length"))); Codes->insert(OFMake_pair(Distance, DSRBasicCodedEntry("121206", "DCM", "Distance"))); - Codes->insert(OFMake_pair(Width, DSRBasicCodedEntry("G-A220", "SRT", "Width"))); - Codes->insert(OFMake_pair(Depth, DSRBasicCodedEntry("G-D785", "SRT", "Depth"))); - Codes->insert(OFMake_pair(Diameter, DSRBasicCodedEntry("M-02550", "SRT", "Diameter"))); - Codes->insert(OFMake_pair(LongAxis, DSRBasicCodedEntry("G-A185", "SRT", "Long Axis"))); - Codes->insert(OFMake_pair(ShortAxis, DSRBasicCodedEntry("G-A186", "SRT", "Short Axis"))); - Codes->insert(OFMake_pair(MajorAxis, DSRBasicCodedEntry("G-A193", "SRT", "Major Axis"))); - Codes->insert(OFMake_pair(MinorAxis, DSRBasicCodedEntry("G-A194", "SRT", "Minor Axis"))); - Codes->insert(OFMake_pair(PerpendicularAxis, DSRBasicCodedEntry("G-A195", "SRT", "Perpendicular Axis"))); - Codes->insert(OFMake_pair(Radius, DSRBasicCodedEntry("G-A196", "SRT", "Radius"))); - Codes->insert(OFMake_pair(Perimeter, DSRBasicCodedEntry("G-A197", "SRT", "Perimeter"))); - Codes->insert(OFMake_pair(Circumference, DSRBasicCodedEntry("M-02560", "SRT", "Circumference"))); - Codes->insert(OFMake_pair(DiameterOfCircumscribedCircle, DSRBasicCodedEntry("G-A198", "SRT", "Diameter of circumscribed circle"))); + Codes->insert(OFMake_pair(Width, DSRBasicCodedEntry("103355008", "SCT", "Width"))); + Codes->insert(OFMake_pair(Depth, DSRBasicCodedEntry("131197000", "SCT", "Depth"))); + Codes->insert(OFMake_pair(Diameter, DSRBasicCodedEntry("81827009", "SCT", "Diameter"))); + Codes->insert(OFMake_pair(LongAxis, DSRBasicCodedEntry("103339001", "SCT", "Long Axis"))); + Codes->insert(OFMake_pair(ShortAxis, DSRBasicCodedEntry("103340004", "SCT", "Short Axis"))); + Codes->insert(OFMake_pair(MajorAxis, DSRBasicCodedEntry("131187009", "SCT", "Major Axis"))); + Codes->insert(OFMake_pair(MinorAxis, DSRBasicCodedEntry("131188004", "SCT", "Minor Axis"))); + Codes->insert(OFMake_pair(PerpendicularAxis, DSRBasicCodedEntry("131189007", "SCT", "Perpendicular Axis"))); + Codes->insert(OFMake_pair(Radius, DSRBasicCodedEntry("131190003", "SCT", "Radius"))); + Codes->insert(OFMake_pair(Perimeter, DSRBasicCodedEntry("131191004", "SCT", "Perimeter"))); + Codes->insert(OFMake_pair(Circumference, DSRBasicCodedEntry("74551000", "SCT", "Circumference"))); + Codes->insert(OFMake_pair(DiameterOfCircumscribedCircle, DSRBasicCodedEntry("131192006", "SCT", "Diameter of circumscribed circle"))); Codes->insert(OFMake_pair(Height, DSRBasicCodedEntry("121207", "DCM", "Height"))); - Codes->insert(OFMake_pair(Area, DSRBasicCodedEntry("G-A166", "SRT", "Area"))); - Codes->insert(OFMake_pair(AreaOfDefinedRegion, DSRBasicCodedEntry("G-A16A", "SRT", "Area of defined region"))); - Codes->insert(OFMake_pair(Volume, DSRBasicCodedEntry("G-D705", "SRT", "Volume"))); + Codes->insert(OFMake_pair(Maximum3DDiameterOfAMesh, DSRBasicCodedEntry("L0JK", "IBSI", "Maximum 3D Diameter of a Mesh"))); + Codes->insert(OFMake_pair(MajorAxisIn3DLength, DSRBasicCodedEntry("TDIC", "IBSI", "Major Axis in 3D Length"))); + Codes->insert(OFMake_pair(MinorAxisIn3DLength, DSRBasicCodedEntry("P9VJ", "IBSI", "Minor Axis in 3D Length"))); + Codes->insert(OFMake_pair(LeastAxisIn3DLength, DSRBasicCodedEntry("7J51", "IBSI", "Least Axis in 3D Length"))); + Codes->insert(OFMake_pair(Area, DSRBasicCodedEntry("42798000", "SCT", "Area"))); + Codes->insert(OFMake_pair(AreaOfDefinedRegion, DSRBasicCodedEntry("131184002", "SCT", "Area of defined region"))); + Codes->insert(OFMake_pair(SurfaceAreaOfMesh, DSRBasicCodedEntry("C0JK", "IBSI", "Surface Area of Mesh"))); + Codes->insert(OFMake_pair(Volume, DSRBasicCodedEntry("118565006", "SCT", "Volume"))); Codes->insert(OFMake_pair(VolumeEstimatedFromSingle2DRegion, DSRBasicCodedEntry("121216", "DCM", "Volume estimated from single 2D region"))); Codes->insert(OFMake_pair(VolumeEstimatedFromTwoNonCoplanar2DRegions, DSRBasicCodedEntry("121218", "DCM", "Volume estimated from two non-coplanar 2D regions"))); Codes->insert(OFMake_pair(VolumeEstimatedFromThreeOrMoreNonCoplanar2DRegions, DSRBasicCodedEntry("121217", "DCM", "Volume estimated from three or more non-coplanar 2D regions"))); @@ -328,6 +334,8 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA Codes->insert(OFMake_pair(VolumeOfEllipsoid, DSRBasicCodedEntry("121221", "DCM", "Volume of ellipsoid"))); Codes->insert(OFMake_pair(VolumeOfCircumscribedSphere, DSRBasicCodedEntry("121220", "DCM", "Volume of circumscribed sphere"))); Codes->insert(OFMake_pair(VolumeOfBoundingThreeDimensionalRegion, DSRBasicCodedEntry("121219", "DCM", "Volume of bounding three dimensional region"))); + Codes->insert(OFMake_pair(VolumeOfMesh, DSRBasicCodedEntry("RNU0", "IBSI", "Volume of Mesh"))); + Codes->insert(OFMake_pair(VolumeFromVoxelSummation, DSRBasicCodedEntry("YEKZ", "IBSI", "Volume from Voxel Summation"))); } /* should never be NULL */ return *Codes; diff --git a/dcmsr/libcmr/tid1411.cc b/dcmsr/libcmr/tid1411.cc index 3023e8f3..c85b13a5 100644 --- a/dcmsr/libcmr/tid1411.cc +++ b/dcmsr/libcmr/tid1411.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2016-2017, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2016-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class TID1411_VolumetricROIMeasurements @@ -17,7 +17,7 @@ #include "dcmtk/dcmsr/cmr/logger.h" #include "dcmtk/dcmsr/codes/dcm.h" #include "dcmtk/dcmsr/codes/ncit.h" -#include "dcmtk/dcmsr/codes/srt.h" +#include "dcmtk/dcmsr/codes/sct.h" #include "dcmtk/dcmsr/codes/umls.h" #include "dcmtk/dcmsr/dsrtpltn.h" @@ -459,7 +459,7 @@ OFCondition TID1411_VolumetricROIMeasurements::setMeasurem if (!hasMeasurementGroup()) result = createMeasurementGroup(); /* TID 1419 (ROI Measurements) Row 1 */ - CHECK_RESULT(addOrReplaceContentItem(MEASUREMENT_METHOD, RT_hasConceptMod, VT_Code, CODE_SRT_MeasurementMethod, "TID 1419 - Row 1", check)); + CHECK_RESULT(addOrReplaceContentItem(MEASUREMENT_METHOD, RT_hasConceptMod, VT_Code, CODE_SCT_MeasurementMethod, "TID 1419 - Row 1", check)); CHECK_RESULT(getCurrentContentItem().setCodeValue(method, check)); } else result = EC_IllegalParameter; @@ -487,14 +487,14 @@ OFCondition TID1411_VolumetricROIMeasurements::addFindingSite(co if (subTree != NULL) { /* TID 1419 (ROI Measurements) Row 2 */ - CHECK_RESULT(subTree->addContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_FindingSite, check)); + CHECK_RESULT(subTree->addContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_FindingSite, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(site, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1419 - Row 2")); const size_t lastNode = subTree->getNodeID(); /* TID 1419 (ROI Measurements) Row 3 - optional */ if (laterality.hasSelectedValue()) { - CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_Laterality, check)); + CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_Laterality, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(laterality, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1419 - Row 3")); GOOD_RESULT(subTree->gotoParent()); @@ -502,7 +502,7 @@ OFCondition TID1411_VolumetricROIMeasurements::addFindingSite(co /* TID 1419 (ROI Measurements) Row 4 - optional */ if (siteModifier.isComplete()) { - CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_TopographicalModifier, check)); + CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_TopographicalModifier, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(siteModifier, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1419 - Row 4")); GOOD_RESULT(subTree->gotoParent()); diff --git a/dcmsr/libcmr/tid1419m.cc b/dcmsr/libcmr/tid1419m.cc index cb7fb830..fdfb5512 100644 --- a/dcmsr/libcmr/tid1419m.cc +++ b/dcmsr/libcmr/tid1419m.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2017-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2017-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class TID1419_ROIMeasurements_Measurement @@ -20,7 +20,7 @@ #include "dcmtk/dcmsr/cmr/cid7469.h" #include "dcmtk/dcmsr/cmr/logger.h" #include "dcmtk/dcmsr/codes/dcm.h" -#include "dcmtk/dcmsr/codes/srt.h" +#include "dcmtk/dcmsr/codes/sct.h" #include "dcmtk/dcmdata/dcdeftag.h" #include "dcmtk/dcmdata/dcuid.h" @@ -164,7 +164,7 @@ OFCondition TID1419_ROIMeasurements_Measurement::setMeasur if (hasMeasurement()) { /* TID 1419 (ROI Measurements) Row 7 */ - STORE_RESULT(addOrReplaceContentItem(MEASUREMENT_METHOD, RT_hasConceptMod, VT_Code, CODE_SRT_MeasurementMethod, "TID 1419 - Row 7", check)); + STORE_RESULT(addOrReplaceContentItem(MEASUREMENT_METHOD, RT_hasConceptMod, VT_Code, CODE_SCT_MeasurementMethod, "TID 1419 - Row 7", check)); CHECK_RESULT(getCurrentContentItem().setCodeValue(method, check)); } else result = CMR_EC_NoMeasurement; @@ -212,14 +212,14 @@ OFCondition TID1419_ROIMeasurements_Measurement::addFindingSite( if (subTree != NULL) { /* TID 1419 (ROI Measurements) Row 9 */ - STORE_RESULT(subTree->addContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_FindingSite, check)); + STORE_RESULT(subTree->addContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_FindingSite, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(site, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1419 - Row 9")); const size_t lastNode = subTree->getNodeID(); /* TID 1419 (ROI Measurements) Row 10 - optional */ if (laterality.hasSelectedValue()) { - CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_Laterality, check)); + CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_Laterality, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(laterality, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1419 - Row 10")); GOOD_RESULT(subTree->gotoParent()); @@ -227,7 +227,7 @@ OFCondition TID1419_ROIMeasurements_Measurement::addFindingSite( /* TID 1419 (ROI Measurements) Row 11 - optional */ if (siteModifier.isComplete()) { - CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_TopographicalModifier, check)); + CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_TopographicalModifier, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(siteModifier, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1419 - Row 11")); GOOD_RESULT(subTree->gotoParent()); diff --git a/dcmsr/libcmr/tid1501.cc b/dcmsr/libcmr/tid1501.cc index 18622909..e419ca6e 100644 --- a/dcmsr/libcmr/tid1501.cc +++ b/dcmsr/libcmr/tid1501.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2017, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2017-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class TID1501_MeasurementGroup @@ -17,7 +17,7 @@ #include "dcmtk/dcmsr/cmr/logger.h" #include "dcmtk/dcmsr/codes/dcm.h" #include "dcmtk/dcmsr/codes/ncit.h" -#include "dcmtk/dcmsr/codes/srt.h" +#include "dcmtk/dcmsr/codes/sct.h" #include "dcmtk/dcmsr/codes/umls.h" #include "dcmtk/dcmsr/dsrtpltn.h" @@ -273,7 +273,7 @@ OFCondition TID1501_MeasurementGroup::setMeasurementMethod if (!hasMeasurementGroup()) result = createMeasurementGroup(); /* TID 1501 (Measurement Group) Row 5 */ - CHECK_RESULT(addOrReplaceContentItem(MEASUREMENT_METHOD, RT_hasConceptMod, VT_Code, CODE_SRT_MeasurementMethod, "TID 1501 - Row 5", check)); + CHECK_RESULT(addOrReplaceContentItem(MEASUREMENT_METHOD, RT_hasConceptMod, VT_Code, CODE_SCT_MeasurementMethod, "TID 1501 - Row 5", check)); CHECK_RESULT(getCurrentContentItem().setCodeValue(method, check)); } else result = EC_IllegalParameter; @@ -301,14 +301,14 @@ OFCondition TID1501_MeasurementGroup::addFindingSite(const DSRCo if (subTree != NULL) { /* 1501 (Measurement Group) Row 6 */ - CHECK_RESULT(subTree->addContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_FindingSite, check)); + CHECK_RESULT(subTree->addContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_FindingSite, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(site, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1501 - Row 6")); const size_t lastNode = subTree->getNodeID(); /* 1501 (Measurement Group) Row 7 - optional */ if (laterality.hasSelectedValue()) { - CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_Laterality, check)); + CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_Laterality, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(laterality, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1501 - Row 7")); GOOD_RESULT(subTree->gotoParent()); @@ -316,7 +316,7 @@ OFCondition TID1501_MeasurementGroup::addFindingSite(const DSRCo /* 1501 (Measurement Group) Row 8 - optional */ if (siteModifier.isComplete()) { - CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_TopographicalModifier, check)); + CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_TopographicalModifier, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(siteModifier, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 1501 - Row 8")); GOOD_RESULT(subTree->gotoParent()); diff --git a/dcmsr/libcmr/tid1600.cc b/dcmsr/libcmr/tid1600.cc index 19c86677..8436a7c9 100644 --- a/dcmsr/libcmr/tid1600.cc +++ b/dcmsr/libcmr/tid1600.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class TID1600_ImageLibrary @@ -20,7 +20,7 @@ #include "dcmtk/dcmsr/cmr/cid10033e.h" #include "dcmtk/dcmsr/cmr/logger.h" #include "dcmtk/dcmsr/codes/dcm.h" -#include "dcmtk/dcmsr/codes/srt.h" +#include "dcmtk/dcmsr/codes/sct.h" #include "dcmtk/dcmsr/codes/ucum.h" #include "dcmtk/dcmsr/dsrdattn.h" @@ -415,7 +415,7 @@ OFCondition TID1600_ImageLibrary::setPETImageRadionuclide(const CID4020_PETRadio /* go to image library entry and check for expected modality */ OFCondition result = goAndCheckImageLibraryEntry(CODE_DCM_PositronEmissionTomography); /* set content item value (and add a new content item if needed) */ - CHECK_RESULT(setCodeContentItemFromValue(CODE_SRT_Radionuclide, radionuclide, "TID 1607 - Row 1", check)); + CHECK_RESULT(setCodeContentItemFromValue(CODE_SCT_Radionuclide, radionuclide, "TID 1607 - Row 1", check)); /* in case of error, reset cursor to stored node */ BAD_RESULT(setCursor(cursor)); return result; @@ -430,7 +430,7 @@ OFCondition TID1600_ImageLibrary::setPETImageRadiopharmaceuticalAgent(const CID4 /* go to image library entry and check for expected modality */ OFCondition result = goAndCheckImageLibraryEntry(CODE_DCM_PositronEmissionTomography); /* set content item value (and add a new content item if needed) */ - CHECK_RESULT(setCodeContentItemFromValue(CODE_SRT_RadiopharmaceuticalAgent, agent, "TID 1607 - Row 2", check)); + CHECK_RESULT(setCodeContentItemFromValue(CODE_SCT_RadiopharmaceuticalAgent, agent, "TID 1607 - Row 2", check)); /* in case of error, reset cursor to stored node */ BAD_RESULT(setCursor(cursor)); return result; @@ -871,14 +871,14 @@ OFCondition TID1600_ImageLibrary::addPositronEmissionTomographyDescriptors(DSRDo if (item != NULL) { /* TID 1607 (Image Library Entry Descriptors for PET) Row 1 */ - if (checkDescriptorToBeAdded(CODE_SRT_Radionuclide, mode, descriptors)) - CHECK_RESULT(addCodeContentItemFromDataset(tree, *item, DCM_RadionuclideCodeSequence, CODE_SRT_Radionuclide, "TID 1607 - Row 1", check)); + if (checkDescriptorToBeAdded(CODE_SCT_Radionuclide, mode, descriptors)) + CHECK_RESULT(addCodeContentItemFromDataset(tree, *item, DCM_RadionuclideCodeSequence, CODE_SCT_Radionuclide, "TID 1607 - Row 1", check)); /* TID 1607 (Image Library Entry Descriptors for PET) Row 2 */ - if (checkDescriptorToBeAdded(CODE_SRT_RadiopharmaceuticalAgent, mode, descriptors)) - CHECK_RESULT(addCodeContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalCodeSequence, CODE_SRT_RadiopharmaceuticalAgent, "TID 1607 - Row 2", check)); + if (checkDescriptorToBeAdded(CODE_SCT_RadiopharmaceuticalAgent, mode, descriptors)) + CHECK_RESULT(addCodeContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalCodeSequence, CODE_SCT_RadiopharmaceuticalAgent, "TID 1607 - Row 2", check)); /* TID 1607 (Image Library Entry Descriptors for PET) Row 3 */ - if (checkDescriptorToBeAdded(CODE_SRT_HalfLifeOfRadiopharmaceutical, mode, descriptors)) - CHECK_RESULT(addNumericContentItemFromDataset(tree, *item, DCM_RadionuclideHalfLife, 0 /*pos*/, CODE_SRT_HalfLifeOfRadiopharmaceutical, CODE_UCUM_s, "TID 1607 - Row 3", check)); + if (checkDescriptorToBeAdded(CODE_SCT_HalfLifeOfRadiopharmaceutical, mode, descriptors)) + CHECK_RESULT(addNumericContentItemFromDataset(tree, *item, DCM_RadionuclideHalfLife, 0 /*pos*/, CODE_SCT_HalfLifeOfRadiopharmaceutical, CODE_UCUM_s, "TID 1607 - Row 3", check)); /* TID 1607 (Image Library Entry Descriptors for PET) Row 4 */ if (checkDescriptorToBeAdded(CODE_DCM_RadiopharmaceuticalStartDateTime, mode, descriptors)) CHECK_RESULT(addStringContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalStartDateTime, 0 /*pos*/, VT_DateTime, CODE_DCM_RadiopharmaceuticalStartDateTime, "TID 1607 - Row 4", check)); @@ -895,8 +895,8 @@ OFCondition TID1600_ImageLibrary::addPositronEmissionTomographyDescriptors(DSRDo if (checkDescriptorToBeAdded(CODE_DCM_RadiopharmaceuticalSpecificActivity, mode, descriptors)) CHECK_RESULT(addNumericContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalSpecificActivity, 0 /*pos*/, CODE_DCM_RadiopharmaceuticalSpecificActivity, CODE_UCUM_BqPerMol, "TID 1607 - Row 8", check)); /* TID 1607 (Image Library Entry Descriptors for PET) Row 9 */ - if (checkDescriptorToBeAdded(CODE_SRT_RouteOfAdministration, mode, descriptors)) - CHECK_RESULT(addCodeContentItemFromDataset(tree, *item, DCM_AdministrationRouteCodeSequence, CODE_SRT_RouteOfAdministration, "TID 1607 - Row 9", check)); + if (checkDescriptorToBeAdded(CODE_SCT_RouteOfAdministration, mode, descriptors)) + CHECK_RESULT(addCodeContentItemFromDataset(tree, *item, DCM_AdministrationRouteCodeSequence, CODE_SCT_RouteOfAdministration, "TID 1607 - Row 9", check)); } } /* TID 1607 (Image Library Entry Descriptors for PET) Row 10 to 11 diff --git a/dcmsr/libcmr/tid300.cc b/dcmsr/libcmr/tid300.cc index 8e7859eb..3c4c06b5 100644 --- a/dcmsr/libcmr/tid300.cc +++ b/dcmsr/libcmr/tid300.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2017-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2017-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * Source file for class TID300_Measurement @@ -20,7 +20,7 @@ #include "dcmtk/dcmsr/cmr/cid7469.h" #include "dcmtk/dcmsr/cmr/logger.h" #include "dcmtk/dcmsr/codes/dcm.h" -#include "dcmtk/dcmsr/codes/srt.h" +#include "dcmtk/dcmsr/codes/sct.h" #include "dcmtk/dcmdata/dcdeftag.h" #include "dcmtk/dcmdata/dcuid.h" @@ -161,7 +161,7 @@ OFCondition TID300_Measurement::setMeasurementMethod(const if (hasMeasurement()) { /* TID 300 (Measurement) Row 3 */ - STORE_RESULT(addOrReplaceContentItem(MEASUREMENT_METHOD, RT_hasConceptMod, VT_Code, CODE_SRT_MeasurementMethod, "TID 300 - Row 3", check)); + STORE_RESULT(addOrReplaceContentItem(MEASUREMENT_METHOD, RT_hasConceptMod, VT_Code, CODE_SCT_MeasurementMethod, "TID 300 - Row 3", check)); CHECK_RESULT(getCurrentContentItem().setCodeValue(method, check)); } else result = CMR_EC_NoMeasurement; @@ -209,14 +209,14 @@ OFCondition TID300_Measurement::addFindingSite(const DSRCodedEnt if (subTree != NULL) { /* TID 300 (Measurement) Row 5 */ - STORE_RESULT(subTree->addContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_FindingSite, check)); + STORE_RESULT(subTree->addContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_FindingSite, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(site, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 300 - Row 5")); const size_t lastNode = subTree->getNodeID(); /* TID 300 (Measurement) Row 6 - optional */ if (laterality.hasSelectedValue()) { - CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_Laterality, check)); + CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_Laterality, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(laterality, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 300 - Row 6")); GOOD_RESULT(subTree->gotoParent()); @@ -224,7 +224,7 @@ OFCondition TID300_Measurement::addFindingSite(const DSRCodedEnt /* TID 300 (Measurement) Row 7 - optional */ if (siteModifier.isComplete()) { - CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SRT_TopographicalModifier, check)); + CHECK_RESULT(subTree->addChildContentItem(RT_hasConceptMod, VT_Code, CODE_SCT_TopographicalModifier, check)); CHECK_RESULT(subTree->getCurrentContentItem().setCodeValue(siteModifier, check)); CHECK_RESULT(subTree->getCurrentContentItem().setAnnotationText("TID 300 - Row 7")); GOOD_RESULT(subTree->gotoParent()); diff --git a/dcmsr/libsrc/CMakeLists.txt b/dcmsr/libsrc/CMakeLists.txt index d87c0d77..73154406 100644 --- a/dcmsr/libsrc/CMakeLists.txt +++ b/dcmsr/libsrc/CMakeLists.txt @@ -1,5 +1,5 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdncsr dsrdnflt dsrdoc dsrdocst dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgse dsrimgtn dsrimgvl dsritcsr dsrnumtn dsrnumvl dsrpnmtn dsrposcn dsrrefin dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtpltn dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc dsrimpcc dsrc3dcc dsrrrdcc dsracqcc dsrsaecc dsrprdcc dsrctpl dsrrtpl dsrstpl dsrctxgr) +DCMTK_ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdncsr dsrdnflt dsrdoc dsrdocst dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgse dsrimgtn dsrimgvl dsritcsr dsrnumtn dsrnumvl dsrpnmtn dsrposcn dsrrefin dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtpltn dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc dsrimpcc dsrc3dcc dsrrrdcc dsracqcc dsrsaecc dsrprdcc dsrpficc dsrplicc dsrctpl dsrrtpl dsrstpl dsrctxgr) DCMTK_TARGET_LINK_MODULES(dcmsr ofstd oflog dcmdata dcmimgle dcmimage) DCMTK_TARGET_LINK_LIBRARIES(dcmsr ${LIBXML_LIBS}) diff --git a/dcmsr/libsrc/Makefile.dep b/dcmsr/libsrc/Makefile.dep index ce4f59c1..a97cade6 100644 --- a/dcmsr/libsrc/Makefile.dep +++ b/dcmsr/libsrc/Makefile.dep @@ -42,22 +42,17 @@ dsracqcc.o: dsracqcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -105,22 +100,17 @@ dsrbascc.o: dsrbascc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -168,22 +158,17 @@ dsrc3dcc.o: dsrc3dcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -231,22 +216,17 @@ dsrchecc.o: dsrchecc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -294,22 +274,17 @@ dsrcitem.o: dsrcitem.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -317,7 +292,9 @@ dsrcitem.o: dsrcitem.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrnumvl.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrnumvl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \ @@ -380,22 +357,17 @@ dsrcodtn.o: dsrcodtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -403,8 +375,9 @@ dsrcodtn.o: dsrcodtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ - ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h dsrcodvl.o: dsrcodvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \ @@ -449,27 +422,23 @@ dsrcodvl.o: dsrcodvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ - ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \ @@ -527,22 +496,17 @@ dsrcolcc.o: dsrcolcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -590,22 +554,17 @@ dsrcomcc.o: dsrcomcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -652,22 +611,17 @@ dsrcomtn.o: dsrcomtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -675,8 +629,10 @@ dsrcomtn.o: dsrcomtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrcomvl.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h dsrcomvl.o: dsrcomvl.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -722,22 +678,17 @@ dsrcomvl.o: dsrcomvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -790,22 +741,17 @@ dsrcontn.o: dsrcontn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -813,8 +759,9 @@ dsrcontn.o: dsrcontn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ - ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h dsrcsidl.o: dsrcsidl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrcsidl.h ../include/dcmtk/dcmsr/dsrtypes.h \ @@ -860,22 +807,17 @@ dsrcsidl.o: dsrcsidl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -933,22 +875,17 @@ dsrctpl.o: dsrctpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -956,8 +893,9 @@ dsrctpl.o: dsrctpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrdncsr.h \ - ../include/dcmtk/dcmsr/dsrdnflt.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../../ofstd/include/dcmtk/ofstd/oftime.h \ @@ -1021,25 +959,21 @@ dsrctxgr.o: dsrctxgr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h dsrdattn.o: dsrdattn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ @@ -1083,22 +1017,17 @@ dsrdattn.o: dsrdattn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1106,8 +1035,10 @@ dsrdattn.o: dsrdattn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrstrvl.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \ @@ -1156,28 +1087,24 @@ dsrdncsr.o: dsrdncsr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdnflt.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../../ofstd/include/dcmtk/ofstd/oftime.h \ @@ -1226,26 +1153,22 @@ dsrdnflt.o: dsrdnflt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ - ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmsr/dsrtnant.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../../ofstd/include/dcmtk/ofstd/oftime.h \ @@ -1299,22 +1222,17 @@ dsrdoc.o: dsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1322,6 +1240,7 @@ dsrdoc.o: dsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -1402,22 +1321,17 @@ dsrdocst.o: dsrdocst.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1425,6 +1339,7 @@ dsrdocst.o: dsrdocst.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -1491,30 +1406,26 @@ dsrdoctn.o: dsrdoctn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrdncsr.h \ - ../include/dcmtk/dcmsr/dsrdnflt.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../../ofstd/include/dcmtk/ofstd/oftime.h \ @@ -1573,22 +1484,17 @@ dsrdoctr.o: dsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1596,6 +1502,7 @@ dsrdoctr.o: dsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -1660,22 +1567,17 @@ dsrdtitn.o: dsrdtitn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1683,8 +1585,10 @@ dsrdtitn.o: dsrdtitn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrstrvl.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \ @@ -1735,22 +1639,17 @@ dsrenhcc.o: dsrenhcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -1798,22 +1697,17 @@ dsrimgfr.o: dsrimgfr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1865,22 +1759,17 @@ dsrimgse.o: dsrimgse.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1930,22 +1819,17 @@ dsrimgtn.o: dsrimgtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -1953,10 +1837,12 @@ dsrimgtn.o: dsrimgtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrimgvl.h \ - ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \ - ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrimgse.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrcomvl.h \ + ../include/dcmtk/dcmsr/dsrimgfr.h ../include/dcmtk/dcmsr/dsrtlist.h \ + ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h dsrimgvl.o: dsrimgvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrtypes.h \ @@ -2002,22 +1888,17 @@ dsrimgvl.o: dsrimgvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2093,22 +1974,17 @@ dsrimpcc.o: dsrimpcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -2156,22 +2032,17 @@ dsriodcc.o: dsriodcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -2219,32 +2090,28 @@ dsritcsr.o: dsritcsr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtpltn.h \ - ../include/dcmtk/dcmsr/dsrstpl.h ../include/dcmtk/dcmsr/dsrdoctr.h \ - ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrdncsr.h \ - ../include/dcmtk/dcmsr/dsrdnflt.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrtpltn.h ../include/dcmtk/dcmsr/dsrstpl.h \ + ../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \ + ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../../ofstd/include/dcmtk/ofstd/oftime.h \ @@ -2304,22 +2171,17 @@ dsrkeycc.o: dsrkeycc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -2367,22 +2229,17 @@ dsrmaccc.o: dsrmaccc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -2430,22 +2287,17 @@ dsrmamcc.o: dsrmamcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -2492,22 +2344,17 @@ dsrnumtn.o: dsrnumtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2515,7 +2362,9 @@ dsrnumtn.o: dsrnumtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrnumvl.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrnumvl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \ @@ -2563,26 +2412,22 @@ dsrnumvl.o: dsrnumvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../include/dcmtk/dcmsr/dsrnumvl.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \ @@ -2590,6 +2435,122 @@ dsrnumvl.o: dsrnumvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h +dsrpficc.o: dsrpficc.cc ../../config/include/dcmtk/config/osconfig.h \ + ../include/dcmtk/dcmsr/dsrpficc.h ../include/dcmtk/dcmsr/dsriodcc.h \ + ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h +dsrplicc.o: dsrplicc.cc ../../config/include/dcmtk/config/osconfig.h \ + ../include/dcmtk/dcmsr/dsrplicc.h ../include/dcmtk/dcmsr/dsriodcc.h \ + ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofcast.h \ + ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ + ../../oflog/include/dcmtk/oflog/oflog.h \ + ../../oflog/include/dcmtk/oflog/logger.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/loglevel.h \ + ../../ofstd/include/dcmtk/ofstd/ofvector.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ + ../../oflog/include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/ofmem.h \ + ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ + ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ + ../../oflog/include/dcmtk/oflog/layout.h \ + ../../oflog/include/dcmtk/oflog/streams.h \ + ../../oflog/include/dcmtk/oflog/helpers/pointer.h \ + ../../oflog/include/dcmtk/oflog/thread/syncprim.h \ + ../../oflog/include/dcmtk/oflog/spi/filter.h \ + ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \ + ../../oflog/include/dcmtk/oflog/spi/logfact.h \ + ../../oflog/include/dcmtk/oflog/logmacro.h \ + ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ + ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h dsrpnmtn.o: dsrpnmtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ @@ -2633,22 +2594,17 @@ dsrpnmtn.o: dsrpnmtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2656,8 +2612,10 @@ dsrpnmtn.o: dsrpnmtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrstrvl.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \ @@ -2707,21 +2665,16 @@ dsrposcn.o: dsrposcn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -2769,22 +2722,17 @@ dsrprdcc.o: dsrprdcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -2832,22 +2780,17 @@ dsrprocc.o: dsrprocc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -2895,27 +2838,23 @@ dsrrefin.o: dsrrefin.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ - ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \ @@ -2963,22 +2902,17 @@ dsrreftn.o: dsrreftn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -2986,8 +2920,9 @@ dsrreftn.o: dsrreftn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ - ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h dsrrrdcc.o: dsrrrdcc.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -3034,22 +2969,17 @@ dsrrrdcc.o: dsrrrdcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -3098,22 +3028,17 @@ dsrrtpl.o: dsrrtpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3121,6 +3046,7 @@ dsrrtpl.o: dsrrtpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -3184,22 +3110,17 @@ dsrsaecc.o: dsrsaecc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -3247,22 +3168,17 @@ dsrsc3gr.o: dsrsc3gr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3312,22 +3228,17 @@ dsrsc3tn.o: dsrsc3tn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3335,9 +3246,11 @@ dsrsc3tn.o: dsrsc3tn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrsc3vl.h \ - ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtlist.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrsc3vl.h ../include/dcmtk/dcmsr/dsrsc3gr.h \ + ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h dsrsc3vl.o: dsrsc3vl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrsc3vl.h ../include/dcmtk/dcmsr/dsrtypes.h \ ../include/dcmtk/dcmsr/dsdefine.h \ @@ -3382,22 +3295,17 @@ dsrsc3vl.o: dsrsc3vl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3450,22 +3358,17 @@ dsrscogr.o: dsrscogr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3515,22 +3418,17 @@ dsrscotn.o: dsrscotn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3538,9 +3436,11 @@ dsrscotn.o: dsrscotn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrscovl.h \ - ../include/dcmtk/dcmsr/dsrscogr.h ../include/dcmtk/dcmsr/dsrtlist.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \ + ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h dsrscovl.o: dsrscovl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrtypes.h \ ../include/dcmtk/dcmsr/dsdefine.h \ @@ -3585,22 +3485,17 @@ dsrscovl.o: dsrscovl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3653,27 +3548,23 @@ dsrsoprf.o: dsrsoprf.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ - ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \ @@ -3726,22 +3617,17 @@ dsrspecc.o: dsrspecc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h @@ -3790,22 +3676,17 @@ dsrstpl.o: dsrstpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3813,6 +3694,7 @@ dsrstpl.o: dsrstpl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -3874,22 +3756,17 @@ dsrstrvl.o: dsrstrvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -3938,22 +3815,17 @@ dsrtcodt.o: dsrtcodt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4008,22 +3880,17 @@ dsrtcosp.o: dsrtcosp.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4073,22 +3940,17 @@ dsrtcotn.o: dsrtcotn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4096,10 +3958,12 @@ dsrtcotn.o: dsrtcotn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtcovl.h \ - ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtlist.h \ - ../include/dcmtk/dcmsr/dsrtcosp.h ../include/dcmtk/dcmsr/dsrtcoto.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrtcovl.h ../include/dcmtk/dcmsr/dsrtcodt.h \ + ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrtcosp.h \ + ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h dsrtcoto.o: dsrtcoto.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrtypes.h \ ../include/dcmtk/dcmsr/dsdefine.h \ @@ -4144,22 +4008,17 @@ dsrtcoto.o: dsrtcoto.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4211,22 +4070,17 @@ dsrtcovl.o: dsrtcovl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4277,22 +4131,17 @@ dsrtextn.o: dsrtextn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4300,8 +4149,10 @@ dsrtextn.o: dsrtextn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrstrvl.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \ @@ -4349,22 +4200,17 @@ dsrtimtn.o: dsrtimtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4372,8 +4218,10 @@ dsrtimtn.o: dsrtimtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrstrvl.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \ @@ -4421,22 +4269,17 @@ dsrtpltn.o: dsrtpltn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4444,9 +4287,11 @@ dsrtpltn.o: dsrtpltn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrstpl.h \ - ../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \ - ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrstpl.h ../include/dcmtk/dcmsr/dsrdoctr.h \ + ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrdncsr.h \ + ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ ../../ofstd/include/dcmtk/ofstd/oftime.h \ @@ -4508,22 +4353,17 @@ dsrtree.o: dsrtree.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4573,22 +4413,17 @@ dsrtypes.o: dsrtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4596,9 +4431,10 @@ dsrtypes.o: dsrtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrstrvl.h \ - ../include/dcmtk/dcmsr/dsrcodtn.h ../include/dcmtk/dcmsr/dsrnumtn.h \ - ../include/dcmtk/dcmsr/dsrnumvl.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrcodtn.h \ + ../include/dcmtk/dcmsr/dsrnumtn.h ../include/dcmtk/dcmsr/dsrnumvl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \ @@ -4625,6 +4461,7 @@ dsrtypes.o: dsrtypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrimpcc.h ../include/dcmtk/dcmsr/dsrc3dcc.h \ ../include/dcmtk/dcmsr/dsrrrdcc.h ../include/dcmtk/dcmsr/dsracqcc.h \ ../include/dcmtk/dcmsr/dsrsaecc.h ../include/dcmtk/dcmsr/dsrprdcc.h \ + ../include/dcmtk/dcmsr/dsrpficc.h ../include/dcmtk/dcmsr/dsrplicc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \ @@ -4678,22 +4515,17 @@ dsruidtn.o: dsruidtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4701,8 +4533,10 @@ dsruidtn.o: dsruidtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrstrvl.h \ - ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \ + ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h @@ -4750,22 +4584,17 @@ dsrwavch.o: dsrwavch.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4816,22 +4645,17 @@ dsrwavtn.o: dsrwavtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4839,10 +4663,11 @@ dsrwavtn.o: dsrwavtn.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ - ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrwavvl.h \ - ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrwavch.h \ - ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrxmld.h \ - ../include/dcmtk/dcmsr/dsrxmlc.h \ + ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/dcmsr/dsrwavvl.h ../include/dcmtk/dcmsr/dsrcomvl.h \ + ../include/dcmtk/dcmsr/dsrwavch.h ../include/dcmtk/dcmsr/dsrtlist.h \ + ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h dsrwavvl.o: dsrwavvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrwavvl.h ../include/dcmtk/dcmsr/dsrtypes.h \ @@ -4888,22 +4713,17 @@ dsrwavvl.o: dsrwavvl.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -4963,22 +4783,17 @@ dsrxmld.o: dsrxmld.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -5027,22 +4842,17 @@ dsrxrdcc.o: dsrxrdcc.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h diff --git a/dcmsr/libsrc/Makefile.in b/dcmsr/libsrc/Makefile.in index 81c2cc39..bc1c80a9 100644 --- a/dcmsr/libsrc/Makefile.in +++ b/dcmsr/libsrc/Makefile.in @@ -33,7 +33,8 @@ objs = dsrdoc.o dsrposcn.o dsrdncsr.o dsritcsr.o dsrdnflt.o dsrtree.o \ dsrtpltn.o dsrsoprf.o dsrrefin.o dsrcsidl.o dsrxmlc.o dsrxmld.o \ dsriodcc.o dsrbascc.o dsrenhcc.o dsrcomcc.o dsrkeycc.o dsrmamcc.o \ dsrchecc.o dsrcolcc.o dsrprocc.o dsrxrdcc.o dsrspecc.o dsrmaccc.o \ - dsrimpcc.o dsrc3dcc.o dsrrrdcc.o dsracqcc.o dsrsaecc.o dsrprdcc.o + dsrimpcc.o dsrc3dcc.o dsrrrdcc.o dsracqcc.o dsrsaecc.o dsrprdcc.o \ + dsrpficc.o dsrplicc.o library = libdcmsr.$(LIBEXT) diff --git a/dcmsr/libsrc/dsracqcc.cc b/dcmsr/libsrc/dsracqcc.cc index 4deaf8f7..09fa9014 100644 --- a/dcmsr/libsrc/dsracqcc.cc +++ b/dcmsr/libsrc/dsracqcc.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -16,7 +16,7 @@ * Author: Joerg Riesmeier * * Purpose: - * classes: DSRAcquisitionContextConstraintChecker + * classes: DSRAcquisitionContextSRConstraintChecker * */ @@ -26,31 +26,31 @@ #include "dcmtk/dcmsr/dsracqcc.h" -DSRAcquisitionContextConstraintChecker::DSRAcquisitionContextConstraintChecker() +DSRAcquisitionContextSRConstraintChecker::DSRAcquisitionContextSRConstraintChecker() : DSRIODConstraintChecker() { } -DSRAcquisitionContextConstraintChecker::~DSRAcquisitionContextConstraintChecker() +DSRAcquisitionContextSRConstraintChecker::~DSRAcquisitionContextSRConstraintChecker() { } -OFBool DSRAcquisitionContextConstraintChecker::isByReferenceAllowed() const +OFBool DSRAcquisitionContextSRConstraintChecker::isByReferenceAllowed() const { return OFFalse; } -OFBool DSRAcquisitionContextConstraintChecker::isTemplateSupportRequired() const +OFBool DSRAcquisitionContextSRConstraintChecker::isTemplateSupportRequired() const { return OFFalse; } -OFCondition DSRAcquisitionContextConstraintChecker::getRootTemplateIdentification(OFString &templateIdentifier, - OFString &mappingResource) const +OFCondition DSRAcquisitionContextSRConstraintChecker::getRootTemplateIdentification(OFString &templateIdentifier, + OFString &mappingResource) const { templateIdentifier.clear(); mappingResource.clear(); @@ -58,16 +58,16 @@ OFCondition DSRAcquisitionContextConstraintChecker::getRootTemplateIdentificatio } -DSRTypes::E_DocumentType DSRAcquisitionContextConstraintChecker::getDocumentType() const +DSRTypes::E_DocumentType DSRAcquisitionContextSRConstraintChecker::getDocumentType() const { return DT_AcquisitionContextSR; } -OFBool DSRAcquisitionContextConstraintChecker::checkContentRelationship(const E_ValueType sourceValueType, - const E_RelationshipType relationshipType, - const E_ValueType targetValueType, - const OFBool byReference) const +OFBool DSRAcquisitionContextSRConstraintChecker::checkContentRelationship(const E_ValueType sourceValueType, + const E_RelationshipType relationshipType, + const E_ValueType targetValueType, + const OFBool byReference) const { /* the following code implements the constraints of table A.35.16-2 in DICOM PS3.3 */ OFBool result = OFFalse; diff --git a/dcmsr/libsrc/dsrcodtn.cc b/dcmsr/libsrc/dsrcodtn.cc index 24dbb07d..93e7b9b7 100644 --- a/dcmsr/libsrc/dsrcodtn.cc +++ b/dcmsr/libsrc/dsrcodtn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -124,7 +124,7 @@ OFCondition DSRCodeTreeNode::readXMLContentItem(const DSRXMLDocument &doc, if (cursor.valid()) { /* goto "value" element */ - const DSRXMLCursor childCursor = doc.getNamedNode(cursor.getChild(), "value"); + const DSRXMLCursor childCursor = doc.getNamedChildNode(cursor, "value"); if (childCursor.valid()) { /* check whether code is stored as XML elements or attributes */ diff --git a/dcmsr/libsrc/dsrcodvl.cc b/dcmsr/libsrc/dsrcodvl.cc index 93059abe..f3604e71 100644 --- a/dcmsr/libsrc/dsrcodvl.cc +++ b/dcmsr/libsrc/dsrcodvl.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2017, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -254,7 +254,7 @@ OFBool DSRCodedEntryValue::isEmpty() const OFBool DSRCodedEntryValue::isComplete() const { - return !CodeValue.empty() && !CodingSchemeDesignator.empty() && !CodeMeaning.empty(); + return !CodeValue.empty() && (!CodingSchemeDesignator.empty() || (CodeValueType == DSRTypes::CVT_URN)) && !CodeMeaning.empty(); } @@ -277,7 +277,10 @@ void DSRCodedEntryValue::print(STD_NAMESPACE ostream &stream, stream << ",\"" << DSRTypes::convertToPrintString(CodeMeaning, printString) << "\")"; if ((flags & DSRTypes::PF_indicateEnhancedEncodingMode) && usesEnhancedEncodingMode()) stream << "*"; - } else + } + else if ((flags & DSRTypes::PF_printEmptyCodes) && isEmpty()) + stream << "empty code"; + else stream << "invalid code"; } @@ -302,7 +305,12 @@ OFCondition DSRCodedEntryValue::readItem(DcmItem &dataset, } else CodeValueType = DSRTypes::CVT_Long; if (result.good()) - result = DSRTypes::getAndCheckStringValueFromDataset(dataset, DCM_CodingSchemeDesignator, CodingSchemeDesignator, "1", "1", moduleName, acceptViolation); + { + if (CodeValueType == DSRTypes::CVT_URN) /* conditional or mandatory */ + result = DSRTypes::getAndCheckStringValueFromDataset(dataset, DCM_CodingSchemeDesignator, CodingSchemeDesignator, "1", "1C", moduleName, acceptViolation); + else + result = DSRTypes::getAndCheckStringValueFromDataset(dataset, DCM_CodingSchemeDesignator, CodingSchemeDesignator, "1", "1", moduleName, acceptViolation); + } if (result.good()) /* conditional (type 1C) */ DSRTypes::getAndCheckStringValueFromDataset(dataset, DCM_CodingSchemeVersion, CodingSchemeVersion, "1", "1C", moduleName); if (result.good()) @@ -445,7 +453,7 @@ OFCondition DSRCodedEntryValue::writeSequence(DcmItem &dataset, OFCondition DSRCodedEntryValue::writeSequenceItem(DcmItem &item, - const DcmTagKey & /*tagKey*/) + const DcmTagKey & /*tagKey*/) const { /* call the real function, which is "protected" */ return writeItem(item); @@ -475,8 +483,8 @@ OFCondition DSRCodedEntryValue::readXML(const DSRXMLDocument &doc, /* check for known element tags */ if (doc.matchNode(cursor, "scheme")) { - doc.getStringFromNodeContent(doc.getNamedNode(cursor.getChild(), "designator"), CodingSchemeDesignator, NULL /*name*/, OFTrue /*encoding*/, OFFalse /*clearString*/); - doc.getStringFromNodeContent(doc.getNamedNode(cursor.getChild(), "version", OFFalse /*required*/), CodingSchemeVersion, NULL /*name*/, OFTrue /*encoding*/, OFFalse /*clearString*/); + doc.getStringFromNodeContent(doc.getNamedChildNode(cursor, "designator"), CodingSchemeDesignator, NULL /*name*/, OFTrue /*encoding*/, OFFalse /*clearString*/); + doc.getStringFromNodeContent(doc.getNamedChildNode(cursor, "version", OFFalse /*required*/), CodingSchemeVersion, NULL /*name*/, OFTrue /*encoding*/, OFFalse /*clearString*/); } else { doc.getStringFromNodeContent(cursor, CodeValue, "value", OFTrue /*encoding*/, OFFalse /*clearString*/); doc.getStringFromNodeContent(cursor, CodeMeaning, "meaning", OFTrue /*encoding*/, OFFalse /*clearString*/); @@ -638,7 +646,7 @@ OFCondition DSRCodedEntryValue::setCode(const OFString &codeValue, result = checkCode(codeValue, codingSchemeDesignator, codingSchemeVersion, codeMeaning, actualCodeValueType); } else { /* make sure that the mandatory values are non-empty */ - if (codeValue.empty() || codingSchemeDesignator.empty() || codeMeaning.empty()) + if (codeValue.empty() || (codingSchemeDesignator.empty() && (actualCodeValueType != DSRTypes::CVT_URN)) || codeMeaning.empty()) result = EC_IllegalParameter; } if (result.good()) @@ -760,7 +768,7 @@ OFCondition DSRCodedEntryValue::checkCode(const OFString &codeValue, { OFCondition result = EC_Normal; /* first, make sure that the mandatory values are non-empty and the type is valid */ - if (codeValue.empty() || codingSchemeDesignator.empty() || codeMeaning.empty()) + if (codeValue.empty() || (codingSchemeDesignator.empty() && (codeValueType != DSRTypes::CVT_URN)) || codeMeaning.empty()) result = SR_EC_InvalidValue; else if (codeValueType == DSRTypes::CVT_auto) { @@ -792,8 +800,8 @@ OFCondition DSRCodedEntryValue::checkCode(const OFString &codeValue, DSRTypes::E_CodeValueType DSRCodedEntryValue::determineCodeValueType(const OFString &codeValue) { DSRTypes::E_CodeValueType codeValueType = DSRTypes::CVT_auto; - /* first, check for URN schema (tbd: also need to check for URLs?) */ - if (codeValue.compare(0, 4, "urn:") == 0) + /* first, check for URN or URL scheme (not perfect but should do in most cases) */ + if ((codeValue.compare(0, 4, "urn:") == 0) || (codeValue.find("://") != OFString_npos)) codeValueType = DSRTypes::CVT_URN; /* then, check maximum value length (tbd: should be characters not bytes!) */ else if (codeValue.length() > 16) @@ -809,6 +817,6 @@ DSRTypes::E_CodeValueType DSRCodedEntryValue::determineCodeValueType(const OFStr STD_NAMESPACE ostream &operator<<(STD_NAMESPACE ostream &stream, const DSRCodedEntryValue& codedEntryValue) { - codedEntryValue.print(stream, OFTrue /*printCodeValue*/, 0 /*flags*/); + codedEntryValue.print(stream, OFTrue /*printCodeValue*/, DSRTypes::PF_printEmptyCodes /*flags*/); return stream; } diff --git a/dcmsr/libsrc/dsrcomtn.cc b/dcmsr/libsrc/dsrcomtn.cc index 4119cf1c..9d3c5645 100644 --- a/dcmsr/libsrc/dsrcomtn.cc +++ b/dcmsr/libsrc/dsrcomtn.cc @@ -150,7 +150,7 @@ OFCondition DSRCompositeTreeNode::readXMLContentItem(const DSRXMLDocument &doc, const size_t flags) { /* retrieve value from XML element "value" */ - return DSRCompositeReferenceValue::readXML(doc, doc.getNamedNode(cursor.gotoChild(), "value"), flags); + return DSRCompositeReferenceValue::readXML(doc, doc.getNamedChildNode(cursor, "value"), flags); } diff --git a/dcmsr/libsrc/dsrdattn.cc b/dcmsr/libsrc/dsrdattn.cc index 8837bd25..89cde2c8 100644 --- a/dcmsr/libsrc/dsrdattn.cc +++ b/dcmsr/libsrc/dsrdattn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -163,7 +163,7 @@ OFCondition DSRDateTreeNode::readXMLContentItem(const DSRXMLDocument &doc, { OFString tmpString; /* retrieve value from XML element "value" */ - OFCondition result = setValue(getValueFromXMLNodeContent(doc, doc.getNamedNode(cursor.gotoChild(), "value"), tmpString)); + OFCondition result = setValue(getValueFromXMLNodeContent(doc, doc.getNamedChildNode(cursor, "value"), tmpString)); if (result == EC_IllegalParameter) result = SR_EC_InvalidValue; return result; diff --git a/dcmsr/libsrc/dsrdoc.cc b/dcmsr/libsrc/dsrdoc.cc index 7137cfb6..6ba96ed5 100644 --- a/dcmsr/libsrc/dsrdoc.cc +++ b/dcmsr/libsrc/dsrdoc.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2017, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -79,12 +79,16 @@ DSRDocument::DSRDocument(const E_DocumentType documentType) StudyDescription(DCM_StudyDescription), PatientName(DCM_PatientName), PatientID(DCM_PatientID), + IssuerOfPatientID(DCM_IssuerOfPatientID), PatientBirthDate(DCM_PatientBirthDate), PatientSex(DCM_PatientSex), Manufacturer(DCM_Manufacturer), ManufacturerModelName(DCM_ManufacturerModelName), DeviceSerialNumber(DCM_DeviceSerialNumber), SoftwareVersions(DCM_SoftwareVersions), + SynchronizationFrameOfReferenceUID(DCM_SynchronizationFrameOfReferenceUID), + SynchronizationTrigger(DCM_SynchronizationTrigger), + AcquisitionTimeSynchronized(DCM_AcquisitionTimeSynchronized), Modality(DCM_Modality), SeriesInstanceUID(DCM_SeriesInstanceUID), SeriesNumber(DCM_SeriesNumber), @@ -147,12 +151,16 @@ void DSRDocument::clear() StudyDescription.clear(); PatientName.clear(); PatientID.clear(); + IssuerOfPatientID.clear(); PatientBirthDate.clear(); PatientSex.clear(); Manufacturer.clear(); ManufacturerModelName.clear(); DeviceSerialNumber.clear(); SoftwareVersions.clear(); + SynchronizationFrameOfReferenceUID.clear(); + SynchronizationTrigger.clear(); + AcquisitionTimeSynchronized.clear(); Modality.clear(); SeriesInstanceUID.clear(); SeriesNumber.clear(); @@ -221,16 +229,21 @@ OFCondition DSRDocument::print(STD_NAMESPACE ostream &stream, patientStr += getPrintStringFromElement(PatientSex, tmpString); if (!PatientBirthDate.isEmpty()) { - if (!patientStr.empty()) - patientStr += ", "; - patientStr += dicomToReadableDate(getStringValueFromElement(PatientBirthDate, tmpString), string2); + if (!patientStr.empty()) + patientStr += ", "; + patientStr += dicomToReadableDate(getStringValueFromElement(PatientBirthDate, tmpString), string2); } if (!PatientID.isEmpty()) { - if (!patientStr.empty()) - patientStr += ", "; - patientStr += '#'; - patientStr += getPrintStringFromElement(PatientID, tmpString); + if (!patientStr.empty()) + patientStr += ", "; + patientStr += '#'; + patientStr += getPrintStringFromElement(PatientID, tmpString); + if (!IssuerOfPatientID.isEmpty()) + { + patientStr += ":"; + patientStr += getPrintStringFromElement(IssuerOfPatientID, tmpString); + } } if (!patientStr.empty()) stream << " (" << patientStr << ")"; @@ -238,11 +251,11 @@ OFCondition DSRDocument::print(STD_NAMESPACE ostream &stream, } /* referring physician */ if (!ReferringPhysicianName.isEmpty()) - { + { DCMSR_PRINT_HEADER_FIELD_START("Referring Physician", " : ") stream << getPrintStringFromElement(ReferringPhysicianName, tmpString); DCMSR_PRINT_HEADER_FIELD_END - } + } /* study-related information */ if (!StudyDescription.isEmpty()) { @@ -278,10 +291,10 @@ OFCondition DSRDocument::print(STD_NAMESPACE ostream &stream, deviceStr += getPrintStringFromElement(ManufacturerModelName, tmpString); if (!DeviceSerialNumber.isEmpty()) { - if (!deviceStr.empty()) - deviceStr += ", "; - deviceStr += '#'; - deviceStr += getPrintStringFromElement(DeviceSerialNumber, tmpString); + if (!deviceStr.empty()) + deviceStr += ", "; + deviceStr += '#'; + deviceStr += getPrintStringFromElement(DeviceSerialNumber, tmpString); } if (!deviceStr.empty()) stream << " (" << deviceStr << ")"; @@ -483,6 +496,16 @@ OFCondition DSRDocument::read(DcmItem &dataset, getAndCheckElementFromDataset(dataset, SoftwareVersions, "1-n", "3", "GeneralEquipmentModule"); } + // --- Synchronization Module --- + if (requiresSynchronizationModule(documentType) /* either the IOD requires this module */ || + dataset.tagExistsWithValue(DCM_SynchronizationFrameOfReferenceUID) || dataset.tagExistsWithValue(DCM_SynchronizationTrigger) || + dataset.tagExistsWithValue(DCM_AcquisitionTimeSynchronized) /* or all attributes should be absent */ ) + { + getAndCheckElementFromDataset(dataset, SynchronizationFrameOfReferenceUID, "1", "1", "SynchronizationModule"); + getAndCheckElementFromDataset(dataset, SynchronizationTrigger, "1", "1", "SynchronizationModule"); + getAndCheckElementFromDataset(dataset, AcquisitionTimeSynchronized, "1", "1", "SynchronizationModule"); + } + // --- SR Document Series Module / Key Object Document Series Module --- getElementFromDataset(dataset, Modality); /* already checked */ if (documentType == DT_KeyObjectSelectionDocument) @@ -586,6 +609,7 @@ OFCondition DSRDocument::readPatientData(DcmItem &dataset, // --- Patient Module --- getAndCheckElementFromDataset(dataset, PatientName, "1", "2", "PatientModule"); getAndCheckElementFromDataset(dataset, PatientID, "1", "2", "PatientModule"); + getAndCheckElementFromDataset(dataset, IssuerOfPatientID, "1", "3", "PatientModule"); getAndCheckElementFromDataset(dataset, PatientBirthDate, "1", "2", "PatientModule"); getAndCheckElementFromDataset(dataset, PatientSex, "1", "2", "PatientModule"); /* always return success */ @@ -657,6 +681,7 @@ OFCondition DSRDocument::write(DcmItem &dataset, // --- Patient Module --- addElementToDataset(result, dataset, new DcmPersonName(PatientName), "1", "2", "PatientModule"); addElementToDataset(result, dataset, new DcmLongString(PatientID), "1", "2", "PatientModule"); + addElementToDataset(result, dataset, new DcmLongString(IssuerOfPatientID), "1", "3", "PatientModule"); addElementToDataset(result, dataset, new DcmDate(PatientBirthDate), "1", "2", "PatientModule"); addElementToDataset(result, dataset, new DcmCodeString(PatientSex), "1", "2", "PatientModule"); @@ -675,6 +700,15 @@ OFCondition DSRDocument::write(DcmItem &dataset, addElementToDataset(result, dataset, new DcmLongString(SoftwareVersions), "1-n", "3", "GeneralEquipmentModule"); } + // --- Synchronization Module --- + if (requiresSynchronizationModule(getDocumentType()) /* module required for some IODs */ || + !SynchronizationFrameOfReferenceUID.isEmpty() || !SynchronizationTrigger.isEmpty() || !AcquisitionTimeSynchronized.isEmpty()) + { + addElementToDataset(result, dataset, new DcmUniqueIdentifier(SynchronizationFrameOfReferenceUID), "1", "1", "SynchronizationModule"); + addElementToDataset(result, dataset, new DcmCodeString(SynchronizationTrigger), "1", "1", "SynchronizationModule"); + addElementToDataset(result, dataset, new DcmCodeString(AcquisitionTimeSynchronized), "1", "1", "SynchronizationModule"); + } + // --- SR Document Series Module / Key Object Document Series Module --- if (getDocumentType() == DT_KeyObjectSelectionDocument) { @@ -828,10 +862,25 @@ OFCondition DSRDocument::readXMLDocumentHeader(DSRXMLDocument &doc, if (doc.getStringFromNodeContent(cursor, tmpString) != documentTypeToModality(getDocumentType())) DCMSR_WARN("Invalid value for 'modality' ... ignoring"); } + else if (doc.matchNode(cursor, "device")) + { + doc.getElementFromNodeContent(doc.getNamedChildNode(cursor, "manufacturer", OFFalse /*required*/), Manufacturer, NULL, OFTrue /*encoding*/); + doc.getElementFromNodeContent(doc.getNamedChildNode(cursor, "model"), ManufacturerModelName, NULL, OFTrue /*encoding*/); + doc.getElementFromNodeContent(doc.getNamedChildNode(cursor, "serial", OFFalse /*required*/), DeviceSerialNumber, NULL, OFTrue /*encoding*/); + doc.getElementFromNodeContent(doc.getNamedChildNode(cursor, "version", OFFalse /*required*/), SoftwareVersions, NULL, OFTrue /*encoding*/); + } + else if (doc.matchNode(cursor, "manufacturer")) + doc.getElementFromNodeContent(cursor, Manufacturer, "manufacturer", OFTrue /*encoding*/); + else if (doc.matchNode(cursor, "synchronization")) + { + doc.getElementFromAttribute(cursor, SynchronizationFrameOfReferenceUID, "uid"); + doc.getElementFromNodeContent(doc.getNamedChildNode(cursor, "trigger"), SynchronizationTrigger); + doc.getElementFromNodeContent(doc.getNamedChildNode(cursor, "acquisitiontime"), AcquisitionTimeSynchronized); + } else if (doc.matchNode(cursor, "referringphysician")) { /* goto sub-element "name" */ - const DSRXMLCursor childNode = doc.getNamedNode(cursor.getChild(), "name"); + const DSRXMLCursor childNode = doc.getNamedChildNode(cursor, "name"); if (childNode.valid()) { /* Referring Physician's Name */ @@ -877,14 +926,7 @@ OFCondition DSRDocument::readXMLDocumentHeader(DSRXMLDocument &doc, } else if (doc.matchNode(cursor, "document")) result = readXMLDocumentData(doc, cursor.getChild(), flags); - else if (doc.matchNode(cursor, "device")) - { - doc.getElementFromNodeContent(doc.getNamedNode(cursor.getChild(), "manufacturer"), Manufacturer, NULL, OFTrue /*encoding*/); - doc.getElementFromNodeContent(doc.getNamedNode(cursor.getChild(), "model"), ManufacturerModelName, NULL, OFTrue /*encoding*/); - doc.getElementFromNodeContent(doc.getNamedNode(cursor.getChild(), "serial", OFFalse /*required*/), DeviceSerialNumber, NULL, OFTrue /*encoding*/); - doc.getElementFromNodeContent(doc.getNamedNode(cursor.getChild(), "version", OFFalse /*required*/), SoftwareVersions, NULL, OFTrue /*encoding*/); - } - else if (doc.getElementFromNodeContent(cursor, Manufacturer, "manufacturer", OFTrue /*encoding*/).bad()) + else doc.printUnexpectedNodeWarning(cursor); /* print node error message (if any) */ doc.printGeneralNodeError(cursor, result); @@ -918,10 +960,11 @@ OFCondition DSRDocument::readXMLPatientData(const DSRXMLDocument &doc, else if (doc.matchNode(cursor, "birthday")) { /* Patient's Birth Date */ - DSRDateTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedNode(cursor.getChild(), "date"), tmpString); + DSRDateTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedChildNode(cursor, "date"), tmpString); PatientBirthDate.putOFStringArray(tmpString); } else if (doc.getElementFromNodeContent(cursor, PatientID, "id").bad() && + doc.getElementFromNodeContent(cursor, IssuerOfPatientID, "issuer").bad() && doc.getElementFromNodeContent(cursor, PatientSex, "sex").bad()) { doc.printUnexpectedNodeWarning(cursor); @@ -959,7 +1002,7 @@ OFCondition DSRDocument::readXMLStudyData(const DSRXMLDocument &doc, if (doc.matchNode(cursor, "accession")) { /* goto sub-element "number" */ - doc.getElementFromNodeContent(doc.getNamedNode(cursor.getChild(), "number"), AccessionNumber); + doc.getElementFromNodeContent(doc.getNamedChildNode(cursor, "number"), AccessionNumber); } else if (doc.matchNode(cursor, "date")) { @@ -1062,10 +1105,10 @@ OFCondition DSRDocument::readXMLInstanceData(const DSRXMLDocument &doc, /* Instance Creator UID */ doc.getElementFromAttribute(cursor, InstanceCreatorUID, "uid", OFFalse /*encoding*/, OFFalse /*required*/); /* Instance Creation Date */ - DSRDateTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedNode(cursor.getChild(), "date"), tmpString); + DSRDateTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedChildNode(cursor, "date"), tmpString); InstanceCreationDate.putOFStringArray(tmpString); /* Instance Creation Time */ - DSRTimeTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedNode(cursor.getChild(), "time"), tmpString); + DSRTimeTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedChildNode(cursor, "time"), tmpString); InstanceCreationTime.putOFStringArray(tmpString); } else if (doc.getElementFromNodeContent(cursor, InstanceNumber, "number").bad()) @@ -1109,7 +1152,7 @@ OFCondition DSRDocument::readXMLDocumentData(const DSRXMLDocument &doc, if (CompletionFlagEnum != CF_invalid) { /* Completion Flag Description (optional) */ - const DSRXMLCursor childCursor = doc.getNamedNode(cursor.getChild(), "description", OFFalse /*required*/); + const DSRXMLCursor childCursor = doc.getNamedChildNode(cursor, "description", OFFalse /*required*/); if (childCursor.valid()) doc.getElementFromNodeContent(childCursor, CompletionFlagDescription, NULL /*name*/, OFTrue /*encoding*/); } else @@ -1141,15 +1184,14 @@ OFCondition DSRDocument::readXMLDocumentData(const DSRXMLDocument &doc, } else if (doc.matchNode(cursor, "content")) { - const DSRXMLCursor childCursor = cursor.getChild(); /* Content Date */ - DSRDateTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedNode(childCursor, "date"), tmpString); + DSRDateTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedChildNode(cursor, "date"), tmpString); ContentDate.putOFStringArray(tmpString); /* Content Time */ - DSRTimeTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedNode(childCursor, "time"), tmpString); + DSRTimeTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedChildNode(cursor, "time"), tmpString); ContentTime.putOFStringArray(tmpString); /* proceed with document tree */ - result = DocumentTree.readXML(doc, childCursor, flags); + result = DocumentTree.readXML(doc, cursor.getChild(), flags); } else doc.printUnexpectedNodeWarning(cursor); /* print node error message (if any) */ @@ -1285,6 +1327,18 @@ OFCondition DSRDocument::writeXML(STD_NAMESPACE ostream &stream, } else writeStringFromElementToXML(stream, Manufacturer, "manufacturer", (flags & XF_writeEmptyTags) > 0); + if ((flags & XF_writeEmptyTags) || !SynchronizationFrameOfReferenceUID.isEmpty() || + !SynchronizationTrigger.isEmpty() || !AcquisitionTimeSynchronized.isEmpty()) + { + stream << "" << OFendl; + writeStringFromElementToXML(stream, SynchronizationTrigger, "trigger", (flags & XF_writeEmptyTags) > 0); + writeStringFromElementToXML(stream, AcquisitionTimeSynchronized, "acquisitiontime", (flags & XF_writeEmptyTags) > 0); + stream << "" << OFendl; + } + if ((flags & XF_writeEmptyTags) || !ReferringPhysicianName.isEmpty()) { stream << "" << OFendl; @@ -1294,6 +1348,7 @@ OFCondition DSRDocument::writeXML(STD_NAMESPACE ostream &stream, stream << "" << OFendl; writeStringFromElementToXML(stream, PatientID, "id", (flags & XF_writeEmptyTags) > 0); + writeStringFromElementToXML(stream, IssuerOfPatientID, "issuer", (flags & XF_writeEmptyTags) > 0); writeStringFromElementToXML(stream, PatientName, "name", (flags & XF_writeEmptyTags) > 0); if ((flags & XF_writeEmptyTags) || !PatientBirthDate.isEmpty()) { @@ -1468,17 +1523,22 @@ void DSRDocument::renderHTMLPatientData(STD_NAMESPACE ostream &stream, } if (!PatientBirthDate.isEmpty()) { - if (!patientStr.empty()) - patientStr += ", "; - patientStr += '*'; - patientStr += dicomToReadableDate(getStringValueFromElement(PatientBirthDate, tmpString), string2); + if (!patientStr.empty()) + patientStr += ", "; + patientStr += '*'; + patientStr += dicomToReadableDate(getStringValueFromElement(PatientBirthDate, tmpString), string2); } if (!PatientID.isEmpty()) { - if (!patientStr.empty()) - patientStr += ", "; - patientStr += '#'; - patientStr += convertToHTMLString(getStringValueFromElement(PatientID, tmpString), htmlString, flags); + if (!patientStr.empty()) + patientStr += ", "; + patientStr += '#'; + patientStr += convertToHTMLString(getStringValueFromElement(PatientID, tmpString), htmlString, flags); + if (!IssuerOfPatientID.isEmpty()) + { + patientStr += ":"; + patientStr += convertToHTMLString(getStringValueFromElement(IssuerOfPatientID, tmpString), htmlString, flags); + } } if (!patientStr.empty()) stream << " (" << patientStr << ")"; @@ -1639,11 +1699,7 @@ OFCondition DSRDocument::renderHTML(STD_NAMESPACE ostream &stream, if (newFlags & HF_copyStyleSheetContent) { /* copy content from CSS file */ -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE ifstream cssFile(styleSheet, STD_NAMESPACE ios::in | STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE ifstream cssFile(styleSheet, STD_NAMESPACE ios::in); -#endif + STD_NAMESPACE ifstream cssFile(styleSheet, OFopenmode_in_nocreate); if (cssFile) { char c; @@ -2278,6 +2334,27 @@ OFCondition DSRDocument::getSoftwareVersions(OFString &value, } +OFCondition DSRDocument::getSynchronizationFrameOfReferenceUID(OFString &value, + const signed long pos) const +{ + return getStringValueFromElement(SynchronizationFrameOfReferenceUID, value, pos); +} + + +OFCondition DSRDocument::getSynchronizationTrigger(OFString &value, + const signed long pos) const +{ + return getStringValueFromElement(SynchronizationTrigger, value, pos); +} + + +OFCondition DSRDocument::getAcquisitionTimeSynchronized(OFString &value, + const signed long pos) const +{ + return getStringValueFromElement(AcquisitionTimeSynchronized, value, pos); +} + + OFCondition DSRDocument::getStudyDate(OFString &value, const signed long pos) const { @@ -2348,6 +2425,13 @@ OFCondition DSRDocument::getPatientID(OFString &value, } +OFCondition DSRDocument::getIssuerOfPatientID(OFString &value, + const signed long pos) const +{ + return getStringValueFromElement(IssuerOfPatientID, value, pos); +} + + OFCondition DSRDocument::getSeriesNumber(OFString &value, const signed long pos) const { @@ -2524,6 +2608,36 @@ OFCondition DSRDocument::setSoftwareVersions(const OFString &value, } +OFCondition DSRDocument::setSynchronizationFrameOfReferenceUID(const OFString &value, + const OFBool check) +{ + OFCondition result = (check) ? DcmUniqueIdentifier::checkStringValue(value, "1") : EC_Normal; + if (result.good()) + result = SynchronizationFrameOfReferenceUID.putOFStringArray(value); + return result; +} + + +OFCondition DSRDocument::setSynchronizationTrigger(const OFString &value, + const OFBool check) +{ + OFCondition result = (check) ? DcmCodeString::checkStringValue(value, "1") : EC_Normal; + if (result.good()) + result = SynchronizationTrigger.putOFStringArray(value); + return result; +} + + +OFCondition DSRDocument::setAcquisitionTimeSynchronized(const OFString &value, + const OFBool check) +{ + OFCondition result = (check) ? DcmCodeString::checkStringValue(value, "1") : EC_Normal; + if (result.good()) + result = AcquisitionTimeSynchronized.putOFStringArray(value); + return result; +} + + OFCondition DSRDocument::setContentDate(const OFString &value, const OFBool check) { @@ -2604,6 +2718,16 @@ OFCondition DSRDocument::setPatientID(const OFString &value, } +OFCondition DSRDocument::setIssuerOfPatientID(const OFString &value, + const OFBool check) +{ + OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal; + if (result.good()) + result = IssuerOfPatientID.putOFStringArray(value); + return result; +} + + OFCondition DSRDocument::setSeriesNumber(const OFString &value, const OFBool check) { diff --git a/dcmsr/libsrc/dsrdocst.cc b/dcmsr/libsrc/dsrdocst.cc index b1650010..3a848129 100644 --- a/dcmsr/libsrc/dsrdocst.cc +++ b/dcmsr/libsrc/dsrdocst.cc @@ -644,7 +644,7 @@ size_t DSRDocumentSubTree::addByReferenceRelationship(const E_RelationshipType r getPosition(sourceString); cursor.getPosition(targetString); /* check whether target node is an ancestor of source node (prevent loops) */ - if (sourceString.substr(0, targetString.length()) != targetString) + if (validByReferenceRelationship(sourceString, targetString)) { const DSRDocumentTreeNode *targetNode = cursor.getNode(); const E_ValueType targetValueType = targetNode->getValueType(); @@ -1168,7 +1168,7 @@ OFCondition DSRDocumentSubTree::checkByReferenceRelationships(const size_t mode, if (refNodeID != cursor.getNodeID()) { /* check whether target node is an ancestor of source node (prevent loops) */ - if (refContentItem.empty() || (nodePosString.substr(0, refContentItem.length()) != refContentItem)) + if (refContentItem.empty() || validByReferenceRelationship(nodePosString, refContentItem)) { /* refCursor should now point to the reference target (refNodeID > 0) */ const DSRDocumentTreeNode *parentNode = cursor.getParentNode(); @@ -1294,3 +1294,16 @@ OFCondition DSRDocumentSubTree::checkSubTreeConstraints(const DSRDocumentSubTree result = EC_IllegalParameter; return result; } + + +// static functions + +OFBool DSRDocumentSubTree::validByReferenceRelationship(const OFString &sourcePosition, + const OFString &targetPosition) +{ + /* check whether target node is an ancestor of source node (prevent loops) */ + OFBool result = (sourcePosition != targetPosition); + if (result && (sourcePosition.length() > targetPosition.length()) && (sourcePosition.compare(0, targetPosition.length() + 1, targetPosition + ".") == 0)) + result = OFFalse; + return result; +} diff --git a/dcmsr/libsrc/dsrdoctn.cc b/dcmsr/libsrc/dsrdoctn.cc index bcbfa3ca..a0025a4b 100644 --- a/dcmsr/libsrc/dsrdoctn.cc +++ b/dcmsr/libsrc/dsrdoctn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2017, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -231,7 +231,7 @@ OFCondition DSRDocumentTreeNode::readXML(const DSRXMLDocument &doc, if (!(flags & XF_templateElementEnclosesItems)) { /* check for optional template identification */ - const DSRXMLCursor childCursor = doc.getNamedNode(cursor.getChild(), "template", OFFalse /*required*/); + const DSRXMLCursor childCursor = doc.getNamedChildNode(cursor, "template", OFFalse /*required*/); if (childCursor.valid()) { /* check whether information is stored as XML attributes */ @@ -241,26 +241,26 @@ OFCondition DSRDocumentTreeNode::readXML(const DSRXMLDocument &doc, doc.getStringFromAttribute(childCursor, mappingResourceUID, "uid", OFFalse /*encoding*/, OFFalse /*required*/); doc.getStringFromAttribute(childCursor, templateIdentifier, "tid"); } else { - const DSRXMLCursor resourceCursor = doc.getNamedNode(childCursor.getChild(), "resource"); + const DSRXMLCursor resourceCursor = doc.getNamedChildNode(childCursor, "resource"); if (resourceCursor.valid()) { doc.getStringFromAttribute(resourceCursor, mappingResourceUID, "uid", OFFalse /*encoding*/, OFFalse /*required*/); doc.getStringFromNodeContent(resourceCursor, mappingResource); } - doc.getStringFromNodeContent(doc.getNamedNode(childCursor.getChild(), "id"), templateIdentifier); + doc.getStringFromNodeContent(doc.getNamedChildNode(childCursor, "id"), templateIdentifier); } if (setTemplateIdentification(templateIdentifier, mappingResource, mappingResourceUID).bad()) DCMSR_WARN("Content item has invalid/incomplete template identification"); } } /* read concept name (not required in some cases) */ - ConceptName.readXML(doc, doc.getNamedNode(cursor.getChild(), "concept", OFFalse /*required*/), flags); + ConceptName.readXML(doc, doc.getNamedChildNode(cursor, "concept", OFFalse /*required*/), flags); /* read observation UID and date/time (optional) */ - const DSRXMLCursor childCursor = doc.getNamedNode(cursor.getChild(), "observation", OFFalse /*required*/); + const DSRXMLCursor childCursor = doc.getNamedChildNode(cursor, "observation", OFFalse /*required*/); if (childCursor.valid()) { doc.getStringFromAttribute(childCursor, ObservationUID, "uid", OFFalse /*encoding*/, OFFalse /*required*/); - DSRDateTimeTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedNode(childCursor.getChild(), "datetime", OFFalse /*required*/), ObservationDateTime); + DSRDateTimeTreeNode::getValueFromXMLNodeContent(doc, doc.getNamedChildNode(childCursor, "datetime", OFFalse /*required*/), ObservationDateTime); } /* read node content (depends on value type) */ result = readXMLContentItem(doc, cursor, flags); diff --git a/dcmsr/libsrc/dsrdtitn.cc b/dcmsr/libsrc/dsrdtitn.cc index 7e3bed3c..4a957c53 100644 --- a/dcmsr/libsrc/dsrdtitn.cc +++ b/dcmsr/libsrc/dsrdtitn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -163,7 +163,7 @@ OFCondition DSRDateTimeTreeNode::readXMLContentItem(const DSRXMLDocument &doc, { OFString tmpString; /* retrieve value from XML element "value" */ - OFCondition result = setValue(getValueFromXMLNodeContent(doc, doc.getNamedNode(cursor.gotoChild(), "value"), tmpString)); + OFCondition result = setValue(getValueFromXMLNodeContent(doc, doc.getNamedChildNode(cursor, "value"), tmpString)); if (result == EC_IllegalParameter) result = SR_EC_InvalidValue; return result; diff --git a/dcmsr/libsrc/dsrimgtn.cc b/dcmsr/libsrc/dsrimgtn.cc index 583f0448..a5d07a8e 100644 --- a/dcmsr/libsrc/dsrimgtn.cc +++ b/dcmsr/libsrc/dsrimgtn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -155,7 +155,7 @@ OFCondition DSRImageTreeNode::readXMLContentItem(const DSRXMLDocument &doc, const size_t flags) { /* retrieve value from XML element "value" */ - return DSRImageReferenceValue::readXML(doc, doc.getNamedNode(cursor.gotoChild(), "value"), flags); + return DSRImageReferenceValue::readXML(doc, doc.getNamedChildNode(cursor, "value"), flags); } diff --git a/dcmsr/libsrc/dsrpficc.cc b/dcmsr/libsrc/dsrpficc.cc new file mode 100644 index 00000000..b8c142a6 --- /dev/null +++ b/dcmsr/libsrc/dsrpficc.cc @@ -0,0 +1,134 @@ +/* + * + * Copyright (C) 2019, J. Riesmeier, Oldenburg, Germany + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation are maintained by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmsr + * + * Author: Joerg Riesmeier + * + * Purpose: + * classes: DSRPerformedImagingAgentAdministrationSRConstraintChecker + * + */ + + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmsr/dsrpficc.h" + + +DSRPerformedImagingAgentAdministrationSRConstraintChecker::DSRPerformedImagingAgentAdministrationSRConstraintChecker() + : DSRIODConstraintChecker() +{ +} + + +DSRPerformedImagingAgentAdministrationSRConstraintChecker::~DSRPerformedImagingAgentAdministrationSRConstraintChecker() +{ +} + + +OFBool DSRPerformedImagingAgentAdministrationSRConstraintChecker::isByReferenceAllowed() const +{ + return OFFalse; +} + + +OFBool DSRPerformedImagingAgentAdministrationSRConstraintChecker::isTemplateSupportRequired() const +{ + return OFTrue; +} + + +OFCondition DSRPerformedImagingAgentAdministrationSRConstraintChecker::getRootTemplateIdentification(OFString &templateIdentifier, + OFString &mappingResource) const +{ + templateIdentifier = "11020"; + mappingResource = "DCMR"; + return EC_Normal; +} + + +DSRTypes::E_DocumentType DSRPerformedImagingAgentAdministrationSRConstraintChecker::getDocumentType() const +{ + return DT_PerformedImagingAgentAdministrationSR; +} + + +OFBool DSRPerformedImagingAgentAdministrationSRConstraintChecker::checkContentRelationship(const E_ValueType sourceValueType, + const E_RelationshipType relationshipType, + const E_ValueType targetValueType, + const OFBool byReference) const +{ + /* the following code implements the constraints of table A.35.20-2 in DICOM PS3.3 */ + OFBool result = OFFalse; + /* by-reference relationships not allowed at all */ + if (!byReference) + { + /* row 1 of the table */ + if ((relationshipType == RT_contains) && (sourceValueType == VT_Container)) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Composite) || + (targetValueType == VT_Image) || (targetValueType == VT_Waveform) || (targetValueType == VT_Container); + } + /* row 2 of the table */ + else if ((relationshipType == RT_hasObsContext) && + ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num) || (sourceValueType == VT_Container))) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Composite); + } + /* row 3 of the table */ + else if ((relationshipType == RT_hasAcqContext) && + ((sourceValueType == VT_Container) || (sourceValueType == VT_Image) || (sourceValueType == VT_Waveform) || + (sourceValueType == VT_Composite) || (sourceValueType == VT_Num))) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Container); + } + /* row 4 of the table */ + else if (relationshipType == RT_hasConceptMod) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code); + } + /* row 5 of the table */ + else if ((relationshipType == RT_hasProperties) && + ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num))) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Image) || + (targetValueType == VT_Waveform) || (targetValueType == VT_Composite) || (targetValueType == VT_Container); + } + /* row 6 of the table */ + else if ((relationshipType == RT_hasProperties) && (sourceValueType == VT_PName)) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_DateTime) || + (targetValueType == VT_Date) || (targetValueType == VT_Time) || (targetValueType == VT_UIDRef) || + (targetValueType == VT_PName); + } + /* row 7 of the table */ + else if ((relationshipType == RT_inferredFrom) && + ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num))) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Image) || + (targetValueType == VT_Waveform) || (targetValueType == VT_Composite) || (targetValueType == VT_Container); + } + } + return result; +} diff --git a/dcmsr/libsrc/dsrplicc.cc b/dcmsr/libsrc/dsrplicc.cc new file mode 100644 index 00000000..e9c4218f --- /dev/null +++ b/dcmsr/libsrc/dsrplicc.cc @@ -0,0 +1,130 @@ +/* + * + * Copyright (C) 2019, J. Riesmeier, Oldenburg, Germany + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation are maintained by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: dcmsr + * + * Author: Joerg Riesmeier + * + * Purpose: + * classes: DSRPlannedImagingAgentAdministrationSRConstraintChecker + * + */ + + +#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ + +#include "dcmtk/dcmsr/dsrplicc.h" + + +DSRPlannedImagingAgentAdministrationSRConstraintChecker::DSRPlannedImagingAgentAdministrationSRConstraintChecker() + : DSRIODConstraintChecker() +{ +} + + +DSRPlannedImagingAgentAdministrationSRConstraintChecker::~DSRPlannedImagingAgentAdministrationSRConstraintChecker() +{ +} + + +OFBool DSRPlannedImagingAgentAdministrationSRConstraintChecker::isByReferenceAllowed() const +{ + return OFFalse; +} + + +OFBool DSRPlannedImagingAgentAdministrationSRConstraintChecker::isTemplateSupportRequired() const +{ + return OFTrue; +} + + +OFCondition DSRPlannedImagingAgentAdministrationSRConstraintChecker::getRootTemplateIdentification(OFString &templateIdentifier, + OFString &mappingResource) const +{ + templateIdentifier = "11001"; + mappingResource = "DCMR"; + return EC_Normal; +} + + +DSRTypes::E_DocumentType DSRPlannedImagingAgentAdministrationSRConstraintChecker::getDocumentType() const +{ + return DT_PlannedImagingAgentAdministrationSR; +} + + +OFBool DSRPlannedImagingAgentAdministrationSRConstraintChecker::checkContentRelationship(const E_ValueType sourceValueType, + const E_RelationshipType relationshipType, + const E_ValueType targetValueType, + const OFBool byReference) const +{ + /* the following code implements the constraints of table A.35.19-2 in DICOM PS3.3 */ + OFBool result = OFFalse; + /* by-reference relationships not allowed at all */ + if (!byReference) + { + /* row 1 of the table */ + if ((relationshipType == RT_contains) && (sourceValueType == VT_Container)) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Container); + } + /* row 2 of the table */ + else if ((relationshipType == RT_hasObsContext) && + ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num) || (sourceValueType == VT_Container))) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName); + } + /* row 3 of the table */ + else if ((relationshipType == RT_hasAcqContext) && + ((sourceValueType == VT_Container) || (sourceValueType == VT_Num))) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Container); + } + /* row 4 of the table */ + else if (relationshipType == RT_hasConceptMod) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code); + } + /* row 5 of the table */ + else if ((relationshipType == RT_hasProperties) && + ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num))) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Container); + } + /* row 6 of the table */ + else if ((relationshipType == RT_hasProperties) && (sourceValueType == VT_PName)) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_DateTime) || + (targetValueType == VT_Date) || (targetValueType == VT_Time) || (targetValueType == VT_UIDRef) || + (targetValueType == VT_PName); + } + /* row 7 of the table */ + else if ((relationshipType == RT_inferredFrom) && + ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num))) + { + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + (targetValueType == VT_DateTime) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || + (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Container); + } + } + return result; +} diff --git a/dcmsr/libsrc/dsrpnmtn.cc b/dcmsr/libsrc/dsrpnmtn.cc index f98d5e49..2f9f41c7 100644 --- a/dcmsr/libsrc/dsrpnmtn.cc +++ b/dcmsr/libsrc/dsrpnmtn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -165,7 +165,7 @@ OFCondition DSRPNameTreeNode::readXMLContentItem(const DSRXMLDocument &doc, if (cursor.valid()) { /* goto sub-node "value" */ - cursor = doc.getNamedNode(cursor.getChild(), "value").getChild(); + cursor = doc.getNamedChildNode(cursor, "value").getChild(); if (cursor.valid()) { /* retrieve person name from XML tag */ diff --git a/dcmsr/libsrc/dsrrefin.cc b/dcmsr/libsrc/dsrrefin.cc index 46eb7086..d843033e 100644 --- a/dcmsr/libsrc/dsrrefin.cc +++ b/dcmsr/libsrc/dsrrefin.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011-2016, OFFIS e.V. + * Copyright (C) 2011-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -152,8 +152,8 @@ OFCondition DSRReferencedInstanceList::readXML(const DSRXMLDocument &doc, if (doc.checkNode(cursor, "value").good()) { /* retrieve SOP class and instance UID */ - if (!doc.getStringFromAttribute(doc.getNamedNode(cursor.getChild(), "sopclass"), sopClassUID, "uid").empty() && - !doc.getStringFromAttribute(doc.getNamedNode(cursor.getChild(), "instance"), instanceUID, "uid").empty()) + if (!doc.getStringFromAttribute(doc.getNamedChildNode(cursor, "sopclass"), sopClassUID, "uid").empty() && + !doc.getStringFromAttribute(doc.getNamedChildNode(cursor, "instance"), instanceUID, "uid").empty()) { result = addItem(sopClassUID, instanceUID, item); if (result.good()) diff --git a/dcmsr/libsrc/dsrrrdcc.cc b/dcmsr/libsrc/dsrrrdcc.cc index 24edb3a2..be362850 100644 --- a/dcmsr/libsrc/dsrrrdcc.cc +++ b/dcmsr/libsrc/dsrrrdcc.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2014-2016, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2014-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -16,7 +16,7 @@ * Author: Joerg Riesmeier * * Purpose: - * classes: DSRRadiopharmaceuticalRadiationDoseConstraintChecker + * classes: DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker * */ @@ -26,31 +26,31 @@ #include "dcmtk/dcmsr/dsrrrdcc.h" -DSRRadiopharmaceuticalRadiationDoseConstraintChecker::DSRRadiopharmaceuticalRadiationDoseConstraintChecker() +DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker::DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker() : DSRIODConstraintChecker() { } -DSRRadiopharmaceuticalRadiationDoseConstraintChecker::~DSRRadiopharmaceuticalRadiationDoseConstraintChecker() +DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker::~DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker() { } -OFBool DSRRadiopharmaceuticalRadiationDoseConstraintChecker::isByReferenceAllowed() const +OFBool DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker::isByReferenceAllowed() const { return OFFalse; } -OFBool DSRRadiopharmaceuticalRadiationDoseConstraintChecker::isTemplateSupportRequired() const +OFBool DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker::isTemplateSupportRequired() const { return OFFalse; } -OFCondition DSRRadiopharmaceuticalRadiationDoseConstraintChecker::getRootTemplateIdentification(OFString &templateIdentifier, - OFString &mappingResource) const +OFCondition DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker::getRootTemplateIdentification(OFString &templateIdentifier, + OFString &mappingResource) const { templateIdentifier.clear(); mappingResource.clear(); @@ -58,16 +58,16 @@ OFCondition DSRRadiopharmaceuticalRadiationDoseConstraintChecker::getRootTemplat } -DSRTypes::E_DocumentType DSRRadiopharmaceuticalRadiationDoseConstraintChecker::getDocumentType() const +DSRTypes::E_DocumentType DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker::getDocumentType() const { return DT_RadiopharmaceuticalRadiationDoseSR; } -OFBool DSRRadiopharmaceuticalRadiationDoseConstraintChecker::checkContentRelationship(const E_ValueType sourceValueType, - const E_RelationshipType relationshipType, - const E_ValueType targetValueType, - const OFBool byReference) const +OFBool DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker::checkContentRelationship(const E_ValueType sourceValueType, + const E_RelationshipType relationshipType, + const E_ValueType targetValueType, + const OFBool byReference) const { /* the following code implements the constraints of table A.35.14-2 in DICOM PS3.3 */ OFBool result = OFFalse; diff --git a/dcmsr/libsrc/dsrtcovl.cc b/dcmsr/libsrc/dsrtcovl.cc index e65633ee..dd03affd 100644 --- a/dcmsr/libsrc/dsrtcovl.cc +++ b/dcmsr/libsrc/dsrtcovl.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2017, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -138,7 +138,7 @@ OFCondition DSRTemporalCoordinatesValue::readXML(const DSRXMLDocument &doc, if (cursor.valid()) { /* graphic data (required) */ - cursor = doc.getNamedNode(cursor.getChild(), "data"); + cursor = doc.getNamedChildNode(cursor, "data"); if (cursor.valid()) { OFString tmpString, typeString; diff --git a/dcmsr/libsrc/dsrtextn.cc b/dcmsr/libsrc/dsrtextn.cc index f213b806..010ead1c 100644 --- a/dcmsr/libsrc/dsrtextn.cc +++ b/dcmsr/libsrc/dsrtextn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -168,7 +168,7 @@ OFCondition DSRTextTreeNode::readXMLContentItem(const DSRXMLDocument &doc, const size_t flags) { /* retrieve value from XML element "value" */ - return DSRStringValue::readXML(doc, doc.getNamedNode(cursor.gotoChild(), "value"), flags, OFTrue /*encoding*/); + return DSRStringValue::readXML(doc, doc.getNamedChildNode(cursor, "value"), flags, OFTrue /*encoding*/); } diff --git a/dcmsr/libsrc/dsrtimtn.cc b/dcmsr/libsrc/dsrtimtn.cc index a38be64e..0175cbe7 100644 --- a/dcmsr/libsrc/dsrtimtn.cc +++ b/dcmsr/libsrc/dsrtimtn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -162,7 +162,7 @@ OFCondition DSRTimeTreeNode::readXMLContentItem(const DSRXMLDocument &doc, { OFString tmpString; /* retrieve value from XML element "value" */ - OFCondition result = setValue(getValueFromXMLNodeContent(doc, doc.getNamedNode(cursor.gotoChild(), "value"), tmpString)); + OFCondition result = setValue(getValueFromXMLNodeContent(doc, doc.getNamedChildNode(cursor, "value"), tmpString)); if (result == EC_IllegalParameter) result = SR_EC_InvalidValue; return result; diff --git a/dcmsr/libsrc/dsrtypes.cc b/dcmsr/libsrc/dsrtypes.cc index 5f8b9ee1..e2d7facb 100644 --- a/dcmsr/libsrc/dsrtypes.cc +++ b/dcmsr/libsrc/dsrtypes.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2017, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -57,6 +57,8 @@ #include "dcmtk/dcmsr/dsracqcc.h" #include "dcmtk/dcmsr/dsrsaecc.h" #include "dcmtk/dcmsr/dsrprdcc.h" +#include "dcmtk/dcmsr/dsrpficc.h" +#include "dcmtk/dcmsr/dsrplicc.h" #include "dcmtk/dcmdata/dcuid.h" #include "dcmtk/dcmdata/dcvrda.h" @@ -154,6 +156,7 @@ const size_t DSRTypes::PF_indicateEnhancedEncodingMode = 1 << 11; const size_t DSRTypes::PF_printAnnotation = 1 << 12; const size_t DSRTypes::PF_hideIncludedTemplateNodes = 1 << 13; const size_t DSRTypes::PF_dontCountIncludedTemplateNodes = 1 << 14; +const size_t DSRTypes::PF_printEmptyCodes = 1 << 15; /* shortcuts */ const size_t DSRTypes::PF_printAllCodes = DSRTypes::PF_printConceptNameCodes; @@ -316,28 +319,31 @@ makeOFConditionConst(SR_EC_CannotProcessIncludedTemplates, OFM_dcmsr, 34, O /* extended IOD modules (only used internally) */ const size_t EM_EnhancedEquipment = 1 << 0; const size_t EM_Timezone = 1 << 1; +const size_t EM_Synchronization = 1 << 2; static const S_DocumentTypeNameMap DocumentTypeNameMap[] = { - {DSRTypes::DT_invalid, "", 0, "", "invalid document type"}, - {DSRTypes::DT_BasicTextSR, UID_BasicTextSRStorage, 0, "SR", "Basic Text SR"}, - {DSRTypes::DT_EnhancedSR, UID_EnhancedSRStorage, 0, "SR", "Enhanced SR"}, - {DSRTypes::DT_ComprehensiveSR, UID_ComprehensiveSRStorage, 0, "SR", "Comprehensive SR"}, - {DSRTypes::DT_KeyObjectSelectionDocument, UID_KeyObjectSelectionDocumentStorage, 0, "KO", "Key Object Selection Document"}, - {DSRTypes::DT_MammographyCadSR, UID_MammographyCADSRStorage, 0, "SR", "Mammography CAD SR"}, - {DSRTypes::DT_ChestCadSR, UID_ChestCADSRStorage, 0, "SR", "Chest CAD SR"}, - {DSRTypes::DT_ColonCadSR, UID_ColonCADSRStorage, EM_EnhancedEquipment, "SR", "Colon CAD SR"}, - {DSRTypes::DT_ProcedureLog, UID_ProcedureLogStorage, 0, "SR", "Procedure Log"}, - {DSRTypes::DT_XRayRadiationDoseSR, UID_XRayRadiationDoseSRStorage, EM_EnhancedEquipment, "SR", "X-Ray Radiation Dose SR"}, - {DSRTypes::DT_SpectaclePrescriptionReport, UID_SpectaclePrescriptionReportStorage, EM_EnhancedEquipment, "SR", "Spectacle Prescription Report"}, - {DSRTypes::DT_MacularGridThicknessAndVolumeReport, UID_MacularGridThicknessAndVolumeReportStorage, EM_EnhancedEquipment, "SR", "Macular Grid Thickness and Volume Report"}, - {DSRTypes::DT_ImplantationPlanSRDocument, UID_ImplantationPlanSRDocumentStorage, EM_EnhancedEquipment, "SR", "Implantation Plan SR Document"}, - {DSRTypes::DT_Comprehensive3DSR, UID_Comprehensive3DSRStorage, 0, "SR", "Comprehensive 3D SR"}, - {DSRTypes::DT_RadiopharmaceuticalRadiationDoseSR, UID_RadiopharmaceuticalRadiationDoseSRStorage, EM_EnhancedEquipment, "SR", "Radiopharmaceutical Radiation Dose SR"}, - {DSRTypes::DT_ExtensibleSR, UID_ExtensibleSRStorage, EM_EnhancedEquipment, "SR", "Extensible SR"}, - {DSRTypes::DT_AcquisitionContextSR, UID_AcquisitionContextSRStorage, EM_EnhancedEquipment, "SR", "Acquisition Context SR"}, - {DSRTypes::DT_SimplifiedAdultEchoSR, UID_SimplifiedAdultEchoSRStorage, EM_EnhancedEquipment | EM_Timezone, "SR", "Simplified Adult Echo SR"}, - {DSRTypes::DT_PatientRadiationDoseSR, UID_PatientRadiationDoseSRStorage, EM_EnhancedEquipment, "SR", "Patient Radiation Dose SR"} + {DSRTypes::DT_invalid, "", 0, "", "invalid document type"}, + {DSRTypes::DT_BasicTextSR, UID_BasicTextSRStorage, 0, "SR", "Basic Text SR"}, + {DSRTypes::DT_EnhancedSR, UID_EnhancedSRStorage, 0, "SR", "Enhanced SR"}, + {DSRTypes::DT_ComprehensiveSR, UID_ComprehensiveSRStorage, 0, "SR", "Comprehensive SR"}, + {DSRTypes::DT_KeyObjectSelectionDocument, UID_KeyObjectSelectionDocumentStorage, 0, "KO", "Key Object Selection Document"}, + {DSRTypes::DT_MammographyCadSR, UID_MammographyCADSRStorage, 0, "SR", "Mammography CAD SR"}, + {DSRTypes::DT_ChestCadSR, UID_ChestCADSRStorage, 0, "SR", "Chest CAD SR"}, + {DSRTypes::DT_ColonCadSR, UID_ColonCADSRStorage, EM_EnhancedEquipment, "SR", "Colon CAD SR"}, + {DSRTypes::DT_ProcedureLog, UID_ProcedureLogStorage, EM_Synchronization, "SR", "Procedure Log"}, + {DSRTypes::DT_XRayRadiationDoseSR, UID_XRayRadiationDoseSRStorage, EM_EnhancedEquipment, "SR", "X-Ray Radiation Dose SR"}, + {DSRTypes::DT_SpectaclePrescriptionReport, UID_SpectaclePrescriptionReportStorage, EM_EnhancedEquipment, "SR", "Spectacle Prescription Report"}, + {DSRTypes::DT_MacularGridThicknessAndVolumeReport, UID_MacularGridThicknessAndVolumeReportStorage, EM_EnhancedEquipment, "SR", "Macular Grid Thickness and Volume Report"}, + {DSRTypes::DT_ImplantationPlanSRDocument, UID_ImplantationPlanSRDocumentStorage, EM_EnhancedEquipment, "SR", "Implantation Plan SR Document"}, + {DSRTypes::DT_Comprehensive3DSR, UID_Comprehensive3DSRStorage, 0, "SR", "Comprehensive 3D SR"}, + {DSRTypes::DT_RadiopharmaceuticalRadiationDoseSR, UID_RadiopharmaceuticalRadiationDoseSRStorage, EM_EnhancedEquipment, "SR", "Radiopharmaceutical Radiation Dose SR"}, + {DSRTypes::DT_ExtensibleSR, UID_ExtensibleSRStorage, EM_EnhancedEquipment, "SR", "Extensible SR"}, + {DSRTypes::DT_AcquisitionContextSR, UID_AcquisitionContextSRStorage, EM_EnhancedEquipment, "SR", "Acquisition Context SR"}, + {DSRTypes::DT_SimplifiedAdultEchoSR, UID_SimplifiedAdultEchoSRStorage, EM_EnhancedEquipment | EM_Timezone, "SR", "Simplified Adult Echo SR"}, + {DSRTypes::DT_PatientRadiationDoseSR, UID_PatientRadiationDoseSRStorage, EM_EnhancedEquipment, "SR", "Patient Radiation Dose SR"}, + {DSRTypes::DT_PerformedImagingAgentAdministrationSR, UID_PerformedImagingAgentAdministrationSRStorage, EM_EnhancedEquipment | EM_Synchronization, "SR", "Performed Imaging Agent Administration SR"}, + {DSRTypes::DT_PlannedImagingAgentAdministrationSR, UID_PlannedImagingAgentAdministrationSRStorage, EM_EnhancedEquipment, "SR", "Planned Imaging Agent Administration SR"} }; @@ -569,6 +575,15 @@ OFBool DSRTypes::requiresTimezoneModule(const E_DocumentType documentType) } +OFBool DSRTypes::requiresSynchronizationModule(const E_DocumentType documentType) +{ + const S_DocumentTypeNameMap *iterator = DocumentTypeNameMap; + while ((iterator->Type != DT_last) && (iterator->Type != documentType)) + iterator++; + return (iterator->ExtendedModules & EM_Synchronization) > 0; +} + + const char *DSRTypes::relationshipTypeToDefinedTerm(const E_RelationshipType relationshipType) { const S_RelationshipTypeNameMap *iterator = RelationshipTypeNameMap; @@ -1484,13 +1499,13 @@ DSRIODConstraintChecker *DSRTypes::createIODConstraintChecker(const E_DocumentTy checker = new DSRComprehensive3DSRConstraintChecker(); break; case DT_RadiopharmaceuticalRadiationDoseSR: - checker = new DSRRadiopharmaceuticalRadiationDoseConstraintChecker(); + checker = new DSRRadiopharmaceuticalRadiationDoseSRConstraintChecker(); break; case DT_ExtensibleSR: /* not yet supported */ break; case DT_AcquisitionContextSR: - checker = new DSRAcquisitionContextConstraintChecker(); + checker = new DSRAcquisitionContextSRConstraintChecker(); break; case DT_SimplifiedAdultEchoSR: checker = new DSRSimplifiedAdultEchoSRConstraintChecker(); @@ -1498,6 +1513,12 @@ DSRIODConstraintChecker *DSRTypes::createIODConstraintChecker(const E_DocumentTy case DT_PatientRadiationDoseSR: checker = new DSRPatientRadiationDoseSRConstraintChecker(); break; + case DT_PerformedImagingAgentAdministrationSR: + checker = new DSRPerformedImagingAgentAdministrationSRConstraintChecker(); + break; + case DT_PlannedImagingAgentAdministrationSR: + checker = new DSRPlannedImagingAgentAdministrationSRConstraintChecker(); + break; case DT_invalid: /* nothing to do */ break; diff --git a/dcmsr/libsrc/dsruidtn.cc b/dcmsr/libsrc/dsruidtn.cc index 7240a11e..4e605133 100644 --- a/dcmsr/libsrc/dsruidtn.cc +++ b/dcmsr/libsrc/dsruidtn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -158,7 +158,7 @@ OFCondition DSRUIDRefTreeNode::readXMLContentItem(const DSRXMLDocument &doc, const size_t flags) { /* retrieve value from XML element "value" */ - return DSRStringValue::readXML(doc, doc.getNamedNode(cursor.gotoChild(), "value"), flags, OFFalse /*encoding*/); + return DSRStringValue::readXML(doc, doc.getNamedChildNode(cursor, "value"), flags, OFFalse /*encoding*/); } diff --git a/dcmsr/libsrc/dsrwavtn.cc b/dcmsr/libsrc/dsrwavtn.cc index f748560b..489af58d 100644 --- a/dcmsr/libsrc/dsrwavtn.cc +++ b/dcmsr/libsrc/dsrwavtn.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -155,7 +155,7 @@ OFCondition DSRWaveformTreeNode::readXMLContentItem(const DSRXMLDocument &doc, const size_t flags) { /* retrieve value from XML element "value" */ - return DSRWaveformReferenceValue::readXML(doc, doc.getNamedNode(cursor.gotoChild(), "value"), flags); + return DSRWaveformReferenceValue::readXML(doc, doc.getNamedChildNode(cursor, "value"), flags); } diff --git a/dcmsr/libsrc/dsrwavvl.cc b/dcmsr/libsrc/dsrwavvl.cc index 61170086..949da637 100644 --- a/dcmsr/libsrc/dsrwavvl.cc +++ b/dcmsr/libsrc/dsrwavvl.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -134,7 +134,7 @@ OFCondition DSRWaveformReferenceValue::readXML(const DSRXMLDocument &doc, if (result.good()) { /* channel list (optional) */ - cursor = doc.getNamedNode(cursor.getChild(), "channels"); + cursor = doc.getNamedChildNode(cursor, "channels"); if (cursor.valid()) { OFString tmpString; diff --git a/dcmsr/libsrc/dsrxmld.cc b/dcmsr/libsrc/dsrxmld.cc index fe3fb811..ed52fbc0 100644 --- a/dcmsr/libsrc/dsrxmld.cc +++ b/dcmsr/libsrc/dsrxmld.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2016, OFFIS e.V. + * Copyright (C) 2003-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -143,8 +143,8 @@ OFCondition DSRXMLDocument::read(const OFString &filename, OFString tmpErrorString; /* first remove any possibly existing document from memory */ clear(); - /* substitute default entities (XML mnenonics) */ - xmlSubstituteEntitiesDefault(1); + /* do not substitute entities (other than the standard ones) */ + xmlSubstituteEntitiesDefault(0); /* add line number to debug messages */ xmlLineNumbersDefault(1); /* enable libxml warnings and error messages */ @@ -300,7 +300,7 @@ DSRXMLCursor DSRXMLDocument::getNamedNode(const DSRXMLCursor &cursor, { OFString tmpString; DCMSR_ERROR("Document of the wrong type, '" << name - << "' expected at " << getFullNodePath(cursor, tmpString, OFFalse /*omitCurrent*/)); + << "' expected at " << getFullNodePath(cursor, tmpString, OFTrue /*omitCurrent*/)); } } else { /* return new node position */ @@ -320,6 +320,35 @@ DSRXMLCursor DSRXMLDocument::getNamedNode(const DSRXMLCursor &, #endif +#ifdef WITH_LIBXML +DSRXMLCursor DSRXMLDocument::getNamedChildNode(const DSRXMLCursor &cursor, + const char *name, + const OFBool required) const +{ + DSRXMLCursor result; + const DSRXMLCursor childCursor = cursor.getChild(); + /* check whether child node is valid */ + if (childCursor.valid()) + result = getNamedNode(childCursor, name, required); + else if (required) + { + OFString tmpString; + DCMSR_ERROR("Document of the wrong type, '" << name + << "' expected at " << getFullNodePath(cursor, tmpString, OFFalse /*omitCurrent*/)); + } + return result; +} +#else /* WITH_LIBXML */ +DSRXMLCursor DSRXMLDocument::getNamedChildNode(const DSRXMLCursor &, + const char *, + const OFBool) const +{ + DSRXMLCursor result; + return result; +} +#endif + + #ifdef WITH_LIBXML OFBool DSRXMLDocument::matchNode(const DSRXMLCursor &cursor, const char *name) const diff --git a/dcmsr/tests/Makefile.dep b/dcmsr/tests/Makefile.dep index 4a789b1a..7238d019 100644 --- a/dcmsr/tests/Makefile.dep +++ b/dcmsr/tests/Makefile.dep @@ -1,18 +1,19 @@ mkreport.o: mkreport.cc ../../config/include/dcmtk/config/osconfig.h \ - ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \ - ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \ - ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ ../../ofstd/include/dcmtk/ofstd/ofexport.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \ + ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \ + ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/oftypes.h \ - ../../ofstd/include/dcmtk/ofstd/ofstream.h \ - ../../ofstd/include/dcmtk/ofstd/ofstring.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ @@ -43,22 +44,17 @@ mkreport.o: mkreport.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ @@ -66,6 +62,7 @@ mkreport.o: mkreport.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmsr/dsrtnant.h \ ../../ofstd/include/dcmtk/ofstd/ofstack.h \ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdnflt.h \ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ ../../ofstd/include/dcmtk/ofstd/ofdate.h \ @@ -130,10 +127,13 @@ mkreport.o: mkreport.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h tests.o: tests.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oftest.h \ @@ -286,7 +286,7 @@ tsrcmr.o: tsrcmr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \ ../include/dcmtk/dcmsr/dsrnumtn.h ../include/dcmtk/dcmsr/codes/dcm.h \ - ../include/dcmtk/dcmsr/codes/srt.h ../include/dcmtk/dcmsr/codes/ucum.h \ + ../include/dcmtk/dcmsr/codes/sct.h ../include/dcmtk/dcmsr/codes/ucum.h \ ../include/dcmtk/dcmsr/cmr/init.h ../include/dcmtk/dcmsr/cmr/define.h \ ../include/dcmtk/dcmsr/cmr/logger.h ../include/dcmtk/dcmsr/cmr/cid29e.h \ ../include/dcmtk/dcmsr/cmr/cid29.h ../include/dcmtk/dcmsr/dsrctxgr.h \ diff --git a/dcmsr/tests/mkreport.cc b/dcmsr/tests/mkreport.cc index 7650c359..b95cfac4 100644 --- a/dcmsr/tests/mkreport.cc +++ b/dcmsr/tests/mkreport.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2016, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -21,6 +21,7 @@ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ +#include "dcmtk/ofstd/ofconsol.h" /* for COUT */ #include "dcmtk/dcmsr/dsrdoc.h" /* for main interface class DSRDocument */ #include "dcmtk/dcmsr/codes/ucum.h" diff --git a/dcmsr/tests/tests.cc b/dcmsr/tests/tests.cc index 8dd27346..eb90254a 100644 --- a/dcmsr/tests/tests.cc +++ b/dcmsr/tests/tests.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2012-2017, OFFIS e.V. + * Copyright (C) 2012-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -44,6 +44,7 @@ OFTEST_REGISTER(dcmsr_gotoParentUntilRoot); OFTEST_REGISTER(dcmsr_gotoAnnotatedTreeNode); OFTEST_REGISTER(dcmsr_addContentItem_1); OFTEST_REGISTER(dcmsr_addContentItem_2); +OFTEST_REGISTER(dcmsr_addContentItem_3); OFTEST_REGISTER(dcmsr_copyContentItem); OFTEST_REGISTER(dcmsr_getCurrentNode); OFTEST_REGISTER(dcmsr_compareNodes); diff --git a/dcmsr/tests/tsrcmr.cc b/dcmsr/tests/tsrcmr.cc index 19ad1ef5..c0ec0821 100644 --- a/dcmsr/tests/tsrcmr.cc +++ b/dcmsr/tests/tsrcmr.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -32,7 +32,7 @@ #include "dcmtk/dcmsr/dsrnumvl.h" #include "dcmtk/dcmsr/dsrnumtn.h" #include "dcmtk/dcmsr/codes/dcm.h" -#include "dcmtk/dcmsr/codes/srt.h" +#include "dcmtk/dcmsr/codes/sct.h" #include "dcmtk/dcmsr/codes/ucum.h" #include "dcmtk/dcmsr/cmr/init.h" #include "dcmtk/dcmsr/cmr/logger.h" @@ -87,7 +87,7 @@ OFTEST(dcmsr_CID244e_Laterality) CID244e_Laterality ctxGroup; DSRCodedEntryValue codedEntry; OFCHECK(!ctxGroup.hasSelectedValue()); - OFCHECK_EQUAL(ctxGroup.mapImageLaterality("R").getCodeValue(), "G-A100"); + OFCHECK_EQUAL(ctxGroup.mapImageLaterality("R").getCodeValue(), "24028007"); OFCHECK(ctxGroup.mapImageLaterality("B", codedEntry).good()); OFCHECK(ctxGroup.selectValue("L").good()); OFCHECK(DSRCodedEntryValue(ctxGroup).getCodeMeaning() == "Left"); @@ -236,7 +236,7 @@ OFTEST(dcmsr_TID1411_VolumetricROIMeasurements) OFCHECK(!volumetric.isValid()); /* do more sophisticated tests */ CMR_TID1419_in_TID1411_in_TID1500 &measurement = volumetric.getMeasurement(); - OFCHECK(volumetric.addFindingSite(DSRBasicCodedEntry("EFGH", "99TEST", "Finding Site"), CMR_CID244::RightAndLeft).good()); + OFCHECK(volumetric.addFindingSite(DSRBasicCodedEntry("EFGH", "99TEST", "Finding Site"), CMR_CID244::Bilateral).good()); OFCHECK(!volumetric.hasMeasurements()); OFCHECK(!measurement.hasMeasurement()); OFCHECK(measurement.createNewMeasurement(CMR_CID7469::Volume, CMR_TID1419_in_TID1411_in_TID1500::MeasurementValue("15", CMR_CID7181::CubicMillimeter)).good()); @@ -348,7 +348,7 @@ OFTEST(dcmsr_TID1500_MeasurementReport) OFCHECK(volMeasurements.setRealWorldValueMap(DSRCompositeReferenceValue(UID_RealWorldValueMappingStorage, "2.0.3.0.4.0")).good()); OFCHECK(volMeasurements.setRealWorldValueMap(DSRCompositeReferenceValue(UID_CTImageStorage, "2.0")).bad()); OFCHECK(volMeasurements.setRealWorldValueMap(dataset).good()); - OFCHECK(volMeasurements.addFindingSite(CODE_SRT_AorticArch).good()); + OFCHECK(volMeasurements.addFindingSite(CODE_SCT_AorticArch).good()); OFCHECK(volMeasurements.setMeasurementMethod(DSRCodedEntryValue(CODE_DCM_SUVBodyWeightCalculationMethod)).good()); OFCHECK(!volMeasurements.isValid()); /* add two measurement values */ diff --git a/dcmsr/tests/tsrcodvl.cc b/dcmsr/tests/tsrcodvl.cc index 121017bb..1155d8e2 100644 --- a/dcmsr/tests/tsrcodvl.cc +++ b/dcmsr/tests/tsrcodvl.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2015-2016, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2015-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -38,6 +38,7 @@ OFTEST(dcmsr_validCompleteOrEmptyCode) const DSRCodedEntryValue code2("0816", "99TEST", "", DSRTypes::CVT_Short, OFFalse /*check*/); const DSRCodedEntryValue code3("a little too long\\with VM>1", "99TEST", "some invalid test code", DSRTypes::CVT_Short, OFFalse /*check*/); const DSRCodedEntryValue code4("", "", ""); + const DSRCodedEntryValue code5("urn:0817", "" /* empty coding scheme designator */, "some other code"); /* then, perform some tests with these codes */ OFCHECK(code1.isValid()); OFCHECK(code1.isComplete()); @@ -51,6 +52,9 @@ OFTEST(dcmsr_validCompleteOrEmptyCode) OFCHECK(!code4.isValid()); OFCHECK(!code4.isComplete()); OFCHECK(code4.isEmpty()); + OFCHECK(code5.isValid()); + OFCHECK(code5.isComplete()); + OFCHECK(!code5.isEmpty()); } @@ -64,7 +68,7 @@ OFTEST(dcmsr_setCodeValueType) OFCHECK(codedEntry.setCode("621566751000087104", "SCT", "Invasive diagnostic procedure", DSRTypes::CVT_Long).good()); OFCHECK_EQUAL(codedEntry.getCodeValueType(), DSRTypes::CVT_Long); /* and finally, set a URN code value */ - OFCHECK(codedEntry.setCode("urn:lex:us:federal:codified.regulation:2013-04-25;45CFR164", "99TEST", "HIPAA Privacy Rule", DSRTypes::CVT_URN).good()); + OFCHECK(codedEntry.setCode("urn:lex:us:federal:codified.regulation:2013-04-25;45CFR164", "", "HIPAA Privacy Rule", DSRTypes::CVT_URN).good()); OFCHECK_EQUAL(codedEntry.getCodeValueType(), DSRTypes::CVT_URN); } @@ -78,9 +82,11 @@ OFTEST(dcmsr_determineCodeValueType) /* then, set a long code value */ OFCHECK(codedEntry.setCode("621566751000087104", "SCT", "Invasive diagnostic procedure").good()); OFCHECK_EQUAL(codedEntry.getCodeValueType(), DSRTypes::CVT_Long); - /* and finally, set a URN code value */ + /* and finally, set a URN/URL code value */ OFCHECK(codedEntry.setCode("urn:lex:us:federal:codified.regulation:2013-04-25;45CFR164", "99TEST", "HIPAA Privacy Rule").good()); OFCHECK_EQUAL(codedEntry.getCodeValueType(), DSRTypes::CVT_URN); + OFCHECK(codedEntry.setCode("http://dcmtk.org/code/0815", "99TEST", "URL test code").good()); + OFCHECK_EQUAL(codedEntry.getCodeValueType(), DSRTypes::CVT_URN); /* also check an empty code */ codedEntry.clear(); OFCHECK(!codedEntry.isValid()); @@ -109,7 +115,7 @@ OFTEST(dcmsr_writeCodeSequence) OFCHECK(!dataset.tagExists(DCM_URNCodeValue, OFTrue /*searchIntoSub*/)); /* and finally, set a URN code value */ dataset.clear(); - OFCHECK(codedEntry.setCode("urn:lex:us:federal:codified.regulation:2013-04-25;45CFR164", "99TEST", "HIPAA Privacy Rule", DSRTypes::CVT_URN).good()); + OFCHECK(codedEntry.setCode("urn:lex:us:federal:codified.regulation:2013-04-25;45CFR164", "" /*empty */, "HIPAA Privacy Rule", DSRTypes::CVT_URN).good()); OFCHECK(codedEntry.writeSequence(dataset, DCM_ConceptNameCodeSequence).good()); OFCHECK(!dataset.tagExists(DCM_CodeValue, OFTrue /*searchIntoSub*/)); OFCHECK(!dataset.tagExists(DCM_LongCodeValue, OFTrue /*searchIntoSub*/)); @@ -131,7 +137,7 @@ OFTEST(dcmsr_useBasicCodedEntry) /* first, define some code constants */ const DSRBasicCodedEntry code1("121206", "DCM", "Distance"); const DSRBasicCodedEntry code2("621566751000087104", "SCT", "Invasive diagnostic procedure", DSRTypes::CVT_auto); - const DSRBasicCodedEntry code3("urn:lex:us:federal:codified.regulation:2013-04-25;45CFR164", "99TEST", "HIPAA Privacy Rule", DSRTypes::CVT_auto); + const DSRBasicCodedEntry code3("urn:lex:us:federal:codified.regulation:2013-04-25;45CFR164", "" /* empty */, "HIPAA Privacy Rule", DSRTypes::CVT_auto); /* then, use them as a coded entry value */ DSRCodedEntryValue codedEntry(code1); OFCHECK(codedEntry.isValid()); @@ -156,7 +162,7 @@ OFTEST(dcmsr_useBasicCodedEntry) OFCHECK(!codedEntry.usesEnhancedEncodingMode()); OFCHECK_EQUAL(codedEntry.getCodeValueType(), DSRTypes::CVT_URN); OFCHECK_EQUAL(codedEntry.getCodeValue(), "urn:lex:us:federal:codified.regulation:2013-04-25;45CFR164"); - OFCHECK_EQUAL(codedEntry.getCodingSchemeDesignator(), "99TEST"); + OFCHECK_EQUAL(codedEntry.getCodingSchemeDesignator(), "" /*empty*/); OFCHECK_EQUAL(codedEntry.getCodingSchemeVersion(), "" /*empty*/); OFCHECK_EQUAL(codedEntry.getCodeMeaning(), "HIPAA Privacy Rule"); } diff --git a/dcmsr/tests/tsrdoctr.cc b/dcmsr/tests/tsrdoctr.cc index 6dea495a..b6e16ab0 100644 --- a/dcmsr/tests/tsrdoctr.cc +++ b/dcmsr/tests/tsrdoctr.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2014-2018, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2014-2019, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -40,7 +40,7 @@ OFTEST(dcmsr_addContentItem_1) /* first, create an SR document to get an empty SR tree */ DSRDocument doc(DSRTypes::DT_ComprehensiveSR); DSRDocumentTree &tree = doc.getTree(); - /* then try to add some content items */ + /* then, try to add some content items */ OFCHECK(tree.addContentItem(DSRTypes::RT_isRoot, DSRTypes::VT_Container)); /* add content item with given pointer */ DSRNumTreeNode *numNode = new DSRNumTreeNode(DSRTypes::RT_contains); @@ -76,6 +76,20 @@ OFTEST(dcmsr_addContentItem_2) } +OFTEST(dcmsr_addContentItem_3) +{ + /* first, create an empty document subtree */ + DSRDocumentSubTree tree; + /* then, try to add some content items */ + OFCHECK(tree.addContentItem(DSRTypes::RT_isRoot, DSRTypes::VT_Container)); + const size_t refTarget = tree.addContentItem(DSRTypes::RT_contains, DSRTypes::VT_Text, DSRTypes::AM_belowCurrent); + OFCHECK(refTarget > 0); + OFCHECK(tree.addContentItem(DSRTypes::RT_hasProperties, DSRTypes::VT_Code, DSRTypes::AM_belowCurrent) > 0); + /* creating a loop (reference to ancestor) should fail */ + OFCHECK(tree.addByReferenceRelationship(DSRTypes::RT_inferredFrom, refTarget) == 0); +} + + OFTEST(dcmsr_copyContentItem) { /* first, create a new SR document */ diff --git a/dcmtls/docs/ciphers.txt b/dcmtls/docs/ciphers.txt index c7650f2f..c8cc48c3 100644 --- a/dcmtls/docs/ciphers.txt +++ b/dcmtls/docs/ciphers.txt @@ -33,10 +33,10 @@ follow the secure profiles define in DICOM Part 15: - BCP 195 TLS Profile (default) This profile proposes the following set of ciphersuites: - - TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2+) - - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2+) - - TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2+) - - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2+) + - TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2) + - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2) + - TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2) + - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2) - TLS_RSA_WITH_AES_128_CBC_SHA - TLS_RSA_WITH_3DES_EDE_CBC_SHA @@ -49,25 +49,43 @@ follow the secure profiles define in DICOM Part 15: - Non-downgrading BCP 195 TLS Profile This profile proposes the following set of ciphersuites: - - TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2+) - - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2+) - - TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2+) - - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2+) + - TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2) + - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2) + - TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2) + - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2) Furthermore, when this profile is active, only TLS version 1.2 or newer will be negotiated. +- Extended BCP 195 TLS Profile + This profile proposes the following set of ciphersuites: + - TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2) + - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2) + - TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2) + - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2) + - TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 (only TLS 1.2) + - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 (only TLS 1.2) + + Furthermore, when this profile is active, only TLS version 1.2 + will be negotiated. In particular, TLS 1.3 will be disabled. + - Basic TLS Secure Transport Connection Profile (retired) This profile only proposes a single ciphersuite for use with TLS 1.0 or newer: - TLS_RSA_WITH_3DES_EDE_CBC_SHA + When this profile is active, only TLS versions up to 1.2 + will be negotiated. TLS 1.3 will be disabled. + - AES TLS Secure Transport Connection Profile (retired) This profile proposes the following set of ciphersuites for use with TLS 1.0 or newer: - TLS_RSA_WITH_AES_128_CBC_SHA - TLS_RSA_WITH_3DES_EDE_CBC_SHA + When this profile is active, only TLS versions up to 1.2 + will be negotiated. TLS 1.3 will be disabled. + - Authenticated unencrypted communication (retired) This profile proposes a single ciphersuite that offers peer authentication and integrity protection, but no encryption. @@ -76,6 +94,9 @@ follow the secure profiles define in DICOM Part 15: (Audit Trail and Node Authentication) integration profile, but has been retired. + When this profile is active, only TLS versions up to 1.2 + will be negotiated. TLS 1.3 will be disabled. + Furthermore, on API level it is also possible to start without a profile and directly define the set of supported ciphersuites, but for security reasons this option has not been made available diff --git a/dcmtls/include/dcmtk/dcmtls/tlsciphr.h b/dcmtls/include/dcmtk/dcmtls/tlsciphr.h index f5e64e3c..dd5ab025 100644 --- a/dcmtls/include/dcmtk/dcmtls/tlsciphr.h +++ b/dcmtls/include/dcmtk/dcmtls/tlsciphr.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2018, OFFIS e.V. + * Copyright (C) 2018-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -82,6 +82,19 @@ enum DcmTLSSecurityProfile */ TSP_Profile_BCP195_ND, + /** DICOM Extended BCP 195 TLS Profile, based on RFC 7525. + * This profile only negotiates TLS 1.2, and will not fall back to + * previous TLS versions. It does NOT support TLS 1.3. + * It supports the same set of ciphersuites as TSP_Profile_BCP195_ND, + * plus TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 and TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256. + * The other ciphersuites suggested by the profile (see DICOM Part 15, section B.11) + * are not supported in OpenSSL 1.0.1 to 1.1.0. + * This profile requires DHE keys of at least 2048 bits and ECDHE keys of at least 256 bits. + * It does not provide backwards compatibility with the older Basic and AES profiles, + * and thus guarantees the higher security level of BCP 195. + */ + TSP_Profile_BCP195_Extended, + /** IHE ATNA Profile for Unencrypted In-house Communication (retired). * This profile uses the ciphersuite SSL_RSA_WITH_NULL_SHA and TLS 1.0 or newer. * This ciphersuite offers peer authentication and integrity of communication, @@ -232,6 +245,14 @@ public: */ DcmTransportLayerStatus setTLSProfile(DcmTLSSecurityProfile profile); + /** return the currently selected TLS profile + * @return currently selected TLS profile + */ + DcmTLSSecurityProfile getTLSProfile() const + { + return currentProfile; + } + /** clear the current list of ciphersuites. Equivalent to * calling setTLSProfile(TSP_Profile_None). */ @@ -274,6 +295,13 @@ public: */ OFBool cipherNULLsupported() const; + /** checks if TLS 1.3 is enabled (permitted) for the currently selected + * TLS security profile. Note that this does not imply that the underlying + * OpenSSL library version actually supports TLS 1.3. That is checked elsewhere. + * @return true if we support TLS 1.3, false otherwise + */ + OFBool isTLS13Enabled() const; + /** print a list of supported ciphersuites to the given output stream * @param os output stream */ @@ -388,6 +416,9 @@ private: /// currently selected DICOM TLS security profile DcmTLSSecurityProfile currentProfile; + /// indicator whether TLS 1.3 is enabled or disabled for the current profile + OFBool tls13_enabled; + /** an array of booleans indicating which ciphersuites known to DCMTK are * actually supported by the OpenSSL library we are using. */ diff --git a/dcmtls/include/dcmtk/dcmtls/tlslayer.h b/dcmtls/include/dcmtk/dcmtls/tlslayer.h index 0d9c06dd..8984ae2b 100644 --- a/dcmtls/include/dcmtk/dcmtls/tlslayer.h +++ b/dcmtls/include/dcmtk/dcmtls/tlslayer.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -267,6 +267,21 @@ public: */ DcmTransportLayerStatus activateCipherSuites(); + /** sets the list of ciphersuites to negotiate, in OpenSSL syntax. + * @note This method is deprecated because it breaks the encapsulation of the + * underlying TLS library (i.e. the parameter string is OpenSSL specific) + * and because this method can be used to violate the constraints of the + * TLS profiles, which other otherwise enforced by this class. + * The newer methods setTLSProfile() and addCipherSuite(), introduced with + * DCMTK 3.6.4, offer a cleaner interface that should be preferred. + * @param suites string containing the list of ciphersuites. + * The list must be in OpenSSL syntax (use findOpenSSLCipherSuiteName to convert + * from RFC 2246 ciphersuite names to OpenSSL names), with ciphersuites separated + * by ':' characters. + * @return TCS_ok if successful, an error code otherwise + */ + DcmTransportLayerStatus setCipherSuites(const char *suites); + /** checks if enough entropy data is available to write back a modified * random seed file. * @return OFTrue if random seed file can be written, OFFalse otherwise. diff --git a/dcmtls/include/dcmtk/dcmtls/tlsopt.h b/dcmtls/include/dcmtk/dcmtls/tlsopt.h index 318751f3..4a9403af 100644 --- a/dcmtls/include/dcmtk/dcmtls/tlsopt.h +++ b/dcmtls/include/dcmtk/dcmtls/tlsopt.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2017-2018, OFFIS e.V. + * Copyright (C) 2017-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -108,7 +108,7 @@ public: * has not yet been created by a call to createTransportLayer(). * @return pointer to transport layer object, may be NULL. */ - DcmTLSTransportLayer *getTransportLayer(); + DcmTransportLayer *getTransportLayer(); /** checks if the command line option --list-ciphers was given. * In this case the list of supported TLS ciphersuites should be diff --git a/dcmtls/include/dcmtk/dcmtls/tlsscu.h b/dcmtls/include/dcmtk/dcmtls/tlsscu.h index 15e82a6a..bb482e7c 100644 --- a/dcmtls/include/dcmtk/dcmtls/tlsscu.h +++ b/dcmtls/include/dcmtk/dcmtls/tlsscu.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2010-2018, OFFIS e.V. + * Copyright (C) 2010-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -145,8 +145,9 @@ public: */ virtual void setPeerCertVerification(const DcmCertificateVerification cert); - /** Set Diffie-Hellman parameters - * @param dhParam Diffie-Hellman parameters to be used. + /** Set Diffie-Hellman parameters from file. This method should be + * called after calls to initNetwork() and setTLSProfile(). + * @param filename of dhParam Diffie-Hellman parameter file to be used. */ virtual void setDHParam(const OFString& dhParam); @@ -191,11 +192,6 @@ public: */ virtual OFString getWriteSeedFile() const; - /** Get Diffie-Hellman parameters set to be used - * @return Diffie-Hellman parameters set to be used - */ - virtual OFString getDHParam() const; - private: /** Private undefined copy-constructor. Shall never be called. @@ -248,9 +244,6 @@ private: /// only validated if present DcmCertificateVerification m_certVerification; - /// File containing Diffie-Hellman parameters to be used - OFString m_dhparam; - }; #endif // WITH_OPENSSL diff --git a/dcmtls/libsrc/Makefile.dep b/dcmtls/libsrc/Makefile.dep index e8ae51ee..153be7d1 100644 --- a/dcmtls/libsrc/Makefile.dep +++ b/dcmtls/libsrc/Makefile.dep @@ -48,18 +48,9 @@ tlsciphr.o: tlsciphr.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -125,18 +116,9 @@ tlslayer.o: tlslayer.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -193,23 +175,23 @@ tlsopt.o: tlsopt.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmnet/include/dcmtk/dcmnet/dul.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ + ../../dcmnet/include/dcmtk/dcmnet/dcuserid.h \ + ../include/dcmtk/dcmtls/tlsdefin.h ../include/dcmtk/dcmtls/tlsciphr.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmnet/include/dcmtk/dcmnet/lst.h \ - ../../dcmnet/include/dcmtk/dcmnet/dul.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ - ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ - ../../dcmnet/include/dcmtk/dcmnet/dcuserid.h \ - ../include/dcmtk/dcmtls/tlsdefin.h ../include/dcmtk/dcmtls/tlsciphr.h \ ../include/dcmtk/dcmtls/tlscond.h tlsscu.o: tlsscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmtls/tlsdefin.h \ @@ -248,26 +230,21 @@ tlsscu.o: tlsscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ @@ -323,11 +300,14 @@ tlsscu.o: tlsscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ ../../ofstd/include/dcmtk/ofstd/ofbmanip.h \ @@ -335,6 +315,7 @@ tlsscu.o: tlsscu.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ @@ -405,18 +386,9 @@ tlstrans.o: tlstrans.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ ../../dcmnet/include/dcmtk/dcmnet/dcuserid.h \ @@ -424,6 +396,11 @@ tlstrans.o: tlstrans.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ diff --git a/dcmtls/libsrc/tlsciphr.cc b/dcmtls/libsrc/tlsciphr.cc index c926dd95..0d5238f3 100644 --- a/dcmtls/libsrc/tlsciphr.cc +++ b/dcmtls/libsrc/tlsciphr.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2018, OFFIS e.V. + * Copyright (C) 2018-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -56,6 +56,9 @@ struct DcmCipherSuiteList * This list only contains ciphersuites that offer an acceptable level of security, * plus the "historic" ciphersuites for older TLS profiles (Basic, AES, IHE ATNA NULL). * + * TLS 1.3 ciphersuites are not included since OpenSSL uses a completely different + * API to negotiate these. + * * IMPORTANT: This list must be sorted from the weakest to the strongest ciphersuite. * - first sort by availability of forward secrecy (RSA < ECDH < ECDHE < DHE) * - then sort by effective key size @@ -153,6 +156,7 @@ const size_t DcmTLSCiphersuiteHandler::unknownCipherSuiteIndex = (size_t) -1; DcmTLSCiphersuiteHandler::DcmTLSCiphersuiteHandler() : ciphersuiteList() , currentProfile(TSP_Profile_None) +, tls13_enabled(OFTrue) , ciphersuiteSupported(new OFBool[GLOBAL_NUM_CIPHERSUITES]) { determineSupportedCiphers(); @@ -242,18 +246,22 @@ DcmTransportLayerStatus DcmTLSCiphersuiteHandler::setTLSProfile(DcmTLSSecurityPr switch (profile) { case TSP_Profile_None: + tls13_enabled = OFTrue; ciphersuiteList.clear(); break; case TSP_Profile_Basic: + tls13_enabled = OFFalse; result = addRequiredCipherSuite("TLS_RSA_WITH_3DES_EDE_CBC_SHA"); if (TCS_ok != result) return result; break; case TSP_Profile_AES: + tls13_enabled = OFFalse; result = addRequiredCipherSuite("TLS_RSA_WITH_AES_128_CBC_SHA"); if (TCS_ok != result) return result; addOptional3DESCipherSuite(); break; case TSP_Profile_BCP195: + tls13_enabled = OFTrue; // recommended ciphersuites as defined in the DICOM profile, plus backwards compatibility result = addRequiredCipherSuite("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"); if (TCS_ok != result) return result; @@ -268,6 +276,7 @@ DcmTransportLayerStatus DcmTLSCiphersuiteHandler::setTLSProfile(DcmTLSSecurityPr addOptional3DESCipherSuite(); break; case TSP_Profile_BCP195_ND: + tls13_enabled = OFTrue; // required ciphersuites as defined in the DICOM profile result = addRequiredCipherSuite("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"); if (TCS_ok != result) return result; @@ -278,7 +287,24 @@ DcmTransportLayerStatus DcmTLSCiphersuiteHandler::setTLSProfile(DcmTLSSecurityPr result = addRequiredCipherSuite("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"); if (TCS_ok != result) return result; break; + case TSP_Profile_BCP195_Extended: + tls13_enabled = OFFalse; + // required ciphersuites as defined in the DICOM profile + result = addRequiredCipherSuite("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"); + if (TCS_ok != result) return result; + result = addRequiredCipherSuite("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"); + if (TCS_ok != result) return result; + result = addRequiredCipherSuite("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"); + if (TCS_ok != result) return result; + result = addRequiredCipherSuite("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"); + if (TCS_ok != result) return result; + result = addRequiredCipherSuite("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"); + if (TCS_ok != result) return result; + result = addRequiredCipherSuite("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"); + if (TCS_ok != result) return result; + break; case TSP_Profile_IHE_ATNA_Unencrypted: + tls13_enabled = OFFalse; result = addRequiredCipherSuite("TLS_RSA_WITH_NULL_SHA"); if (TCS_ok != result) return result; break; @@ -290,6 +316,7 @@ DcmTransportLayerStatus DcmTLSCiphersuiteHandler::setTLSProfile(DcmTLSSecurityPr void DcmTLSCiphersuiteHandler::clearTLSProfile() { + tls13_enabled = OFTrue; currentProfile = TSP_Profile_None; ciphersuiteList.clear(); } @@ -327,14 +354,19 @@ DcmTransportLayerStatus DcmTLSCiphersuiteHandler::addCipherSuite(const char *sui } if (TKE_RSA == getCipherSuiteKeyExchange(idx)) { - DCMTLS_WARN("Ciphersuite '" << suite << "' uses RSA key transport. RFC 7525 recomments that such cipher suites should not be used."); + DCMTLS_WARN("Ciphersuite '" << suite << "' uses RSA key transport. RFC 7525 recommends that such cipher suites should not be used."); } else { - DCMTLS_WARN("Ciphersuite '" << suite << "' uses NO RSA key transport. RFC 7525 recomments that such cipher suites should not be used."); + DCMTLS_WARN("Ciphersuite '" << suite << "' uses NO RSA key transport. RFC 7525 recommends that such cipher suites should not be used."); } break; + case TSP_Profile_BCP195_Extended: + DCMTLS_FATAL("Additional ciphersuites not permitted with security profile '" << lookupProfileName(currentProfile) << "'"); + return TCS_tlsError; + break; + case TSP_Profile_None: case TSP_Profile_IHE_ATNA_Unencrypted: // do nothing @@ -504,6 +536,9 @@ const char *DcmTLSCiphersuiteHandler::lookupProfileName(DcmTLSSecurityProfile pr case TSP_Profile_BCP195_ND: return "Non-downgrading BCP 195 TLS Profile"; break; + case TSP_Profile_BCP195_Extended: + return "Extended BCP 195 TLS Profile"; + break; case TSP_Profile_None: return "None"; break; @@ -532,6 +567,11 @@ OFBool DcmTLSCiphersuiteHandler::cipherNULLsupported() const return OFFalse; } +OFBool DcmTLSCiphersuiteHandler::isTLS13Enabled() const +{ + return tls13_enabled; +} + long DcmTLSCiphersuiteHandler::getTLSOptions() const { long result = 0; @@ -542,9 +582,9 @@ long DcmTLSCiphersuiteHandler::getTLSOptions() const result |= SSL_OP_NO_SSLv3; #endif - // For the Non-downgrading BCP 195 TLS Profile, + // For the Non-downgrading and Extended BCP 195 TLS Profile, // we also disable TLS 1.0 and TLS 1.1 - if (currentProfile == TSP_Profile_BCP195_ND) + if ((currentProfile == TSP_Profile_BCP195_ND) || (currentProfile == TSP_Profile_BCP195_Extended)) { result |= SSL_OP_NO_TLSv1; result |= SSL_OP_NO_TLSv1_1; diff --git a/dcmtls/libsrc/tlslayer.cc b/dcmtls/libsrc/tlslayer.cc index 28ff92b4..6f06c5b7 100644 --- a/dcmtls/libsrc/tlslayer.cc +++ b/dcmtls/libsrc/tlslayer.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -80,32 +80,32 @@ OFLogger DCM_dcmtlsLogger = OFLog::getLogger("dcmtk.dcmtls"); static DH *get_dh2048() { static unsigned char dh2048_p[] = { - 0xC8, 0x04, 0xF6, 0xBF, 0x4B, 0xA6, 0xBA, 0x24, 0xD8, 0x79, - 0xA9, 0x70, 0xFF, 0xA0, 0x6B, 0x9F, 0x9D, 0x56, 0x0F, 0x41, - 0x75, 0x70, 0x69, 0x17, 0xBC, 0x89, 0xB5, 0x38, 0xEE, 0x8A, - 0xA9, 0x2E, 0xFD, 0xC8, 0xD3, 0xBA, 0x43, 0x77, 0x51, 0x46, - 0xBF, 0x59, 0xE0, 0x57, 0xFA, 0x55, 0x6A, 0xC2, 0x4B, 0x63, - 0x24, 0xEE, 0x9E, 0x64, 0x96, 0xBE, 0x13, 0xF7, 0x0B, 0xEC, - 0x0E, 0xEA, 0xC8, 0x8B, 0x3A, 0x59, 0xB5, 0x28, 0xF6, 0x49, - 0x40, 0xC7, 0x89, 0x80, 0x39, 0x97, 0x66, 0x7A, 0xC5, 0x90, - 0xB7, 0x98, 0x3F, 0x11, 0x45, 0xEA, 0xA2, 0xF1, 0x77, 0x7B, - 0xBE, 0x3F, 0x5A, 0x5C, 0xD5, 0xA4, 0x5F, 0xBA, 0x96, 0x87, - 0x77, 0x2D, 0x23, 0xA0, 0x56, 0x5B, 0x14, 0x2D, 0xD6, 0x6C, - 0xF1, 0xCC, 0x0F, 0xD9, 0x7D, 0x42, 0x72, 0x9A, 0x8B, 0xBE, - 0x3E, 0xCB, 0xB4, 0xE3, 0xB9, 0xA8, 0xC2, 0x8F, 0xBA, 0xEB, - 0x12, 0xFE, 0x3E, 0x90, 0x4B, 0xDC, 0x8C, 0xA0, 0xD2, 0x26, - 0x1F, 0x26, 0x78, 0x6E, 0x89, 0x15, 0x59, 0xED, 0x8B, 0x7E, - 0x00, 0x5E, 0xFF, 0xDB, 0x55, 0x60, 0xE3, 0x52, 0x8A, 0x03, - 0x9C, 0xE1, 0x33, 0xE6, 0x9F, 0x17, 0x39, 0x42, 0xE7, 0x26, - 0xAE, 0x3D, 0xC0, 0x66, 0x9F, 0x3C, 0x97, 0xC6, 0x75, 0xAC, - 0x5B, 0xD1, 0xB2, 0x51, 0xCA, 0xB6, 0x4F, 0xFD, 0xAF, 0x41, - 0xF8, 0x8B, 0x5A, 0x8D, 0xC7, 0xCA, 0x3A, 0xB7, 0xE3, 0x00, - 0x7D, 0x20, 0xFA, 0xF1, 0xDE, 0xDA, 0x10, 0xBD, 0x85, 0x09, - 0xA0, 0xE1, 0x24, 0x18, 0x64, 0x38, 0xBA, 0x1C, 0x16, 0x15, - 0x71, 0xA6, 0xC2, 0x02, 0xBA, 0x27, 0xF4, 0xE3, 0x3F, 0xA2, - 0x2E, 0x89, 0xBA, 0xC9, 0xCD, 0x0B, 0x5A, 0x95, 0x26, 0x7D, - 0x10, 0xBE, 0xE3, 0x96, 0x99, 0x4A, 0x2F, 0xAB, 0x9B, 0xBD, - 0xD0, 0xB9, 0xDC, 0x43, 0xF9, 0xCB + 0xC8, 0x04, 0xF6, 0xBF, 0x4B, 0xA6, 0xBA, 0x24, 0xD8, 0x79, + 0xA9, 0x70, 0xFF, 0xA0, 0x6B, 0x9F, 0x9D, 0x56, 0x0F, 0x41, + 0x75, 0x70, 0x69, 0x17, 0xBC, 0x89, 0xB5, 0x38, 0xEE, 0x8A, + 0xA9, 0x2E, 0xFD, 0xC8, 0xD3, 0xBA, 0x43, 0x77, 0x51, 0x46, + 0xBF, 0x59, 0xE0, 0x57, 0xFA, 0x55, 0x6A, 0xC2, 0x4B, 0x63, + 0x24, 0xEE, 0x9E, 0x64, 0x96, 0xBE, 0x13, 0xF7, 0x0B, 0xEC, + 0x0E, 0xEA, 0xC8, 0x8B, 0x3A, 0x59, 0xB5, 0x28, 0xF6, 0x49, + 0x40, 0xC7, 0x89, 0x80, 0x39, 0x97, 0x66, 0x7A, 0xC5, 0x90, + 0xB7, 0x98, 0x3F, 0x11, 0x45, 0xEA, 0xA2, 0xF1, 0x77, 0x7B, + 0xBE, 0x3F, 0x5A, 0x5C, 0xD5, 0xA4, 0x5F, 0xBA, 0x96, 0x87, + 0x77, 0x2D, 0x23, 0xA0, 0x56, 0x5B, 0x14, 0x2D, 0xD6, 0x6C, + 0xF1, 0xCC, 0x0F, 0xD9, 0x7D, 0x42, 0x72, 0x9A, 0x8B, 0xBE, + 0x3E, 0xCB, 0xB4, 0xE3, 0xB9, 0xA8, 0xC2, 0x8F, 0xBA, 0xEB, + 0x12, 0xFE, 0x3E, 0x90, 0x4B, 0xDC, 0x8C, 0xA0, 0xD2, 0x26, + 0x1F, 0x26, 0x78, 0x6E, 0x89, 0x15, 0x59, 0xED, 0x8B, 0x7E, + 0x00, 0x5E, 0xFF, 0xDB, 0x55, 0x60, 0xE3, 0x52, 0x8A, 0x03, + 0x9C, 0xE1, 0x33, 0xE6, 0x9F, 0x17, 0x39, 0x42, 0xE7, 0x26, + 0xAE, 0x3D, 0xC0, 0x66, 0x9F, 0x3C, 0x97, 0xC6, 0x75, 0xAC, + 0x5B, 0xD1, 0xB2, 0x51, 0xCA, 0xB6, 0x4F, 0xFD, 0xAF, 0x41, + 0xF8, 0x8B, 0x5A, 0x8D, 0xC7, 0xCA, 0x3A, 0xB7, 0xE3, 0x00, + 0x7D, 0x20, 0xFA, 0xF1, 0xDE, 0xDA, 0x10, 0xBD, 0x85, 0x09, + 0xA0, 0xE1, 0x24, 0x18, 0x64, 0x38, 0xBA, 0x1C, 0x16, 0x15, + 0x71, 0xA6, 0xC2, 0x02, 0xBA, 0x27, 0xF4, 0xE3, 0x3F, 0xA2, + 0x2E, 0x89, 0xBA, 0xC9, 0xCD, 0x0B, 0x5A, 0x95, 0x26, 0x7D, + 0x10, 0xBE, 0xE3, 0x96, 0x99, 0x4A, 0x2F, 0xAB, 0x9B, 0xBD, + 0xD0, 0xB9, 0xDC, 0x43, 0xF9, 0xCB }; static unsigned char dh2048_g[] = { 0x02 }; @@ -125,7 +125,7 @@ static DH *get_dh2048() BIGNUM *dhp_bn = BN_bin2bn(dh2048_p, sizeof (dh2048_p), NULL); BIGNUM *dhg_bn = BN_bin2bn(dh2048_g, sizeof (dh2048_g), NULL); if (dhp_bn == NULL || dhg_bn == NULL || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) - { + { DH_free(dh); BN_free(dhp_bn); BN_free(dhg_bn); @@ -162,6 +162,67 @@ int DcmTLSTransportLayer_passwordCallback(char *buf, int size, int /* rwflag */, return passwordSize; } + +// The TLS Supported Elliptic Curves extension (RFC 4492) is only supported in OpenSSL 1.0.2 and newer. +// When compiling with OpenSSL 1.0.1, we are not using computeEllipticCurveList(). +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) + +/** determine the list of elliptic curves supported by the OpenSSL library + * for use with the TLS elliptic curve extension. + * @param ecvector a list of supported elliptic curves that have 256 or + * more bits is added to this vector upon return. + */ +static void computeEllipticCurveList(OFVector& ecvector) +{ + // BCP 195: Curves of less than 192 bits SHOULD NOT be used. + // Actually we only enable curves with at least 256 bits in DCMTK, following NIST and BSI recommendations. + const int eclist[] = { + // The list of elliptic curves actually supported by OpenSSL 1.0.2 + // seems to be undocumented. See implementation of tls1_ec_nid2curve_id() + // for a list of supported NIDs. Here are all elliptic curves + // supported by OpenSSL 1.0.2 that have 256 or more bits. + // + // Compiled versions of OpenSSL may further reduce this list. + // For example, OpenSSL on RHEL 7.6 only supports four of these curves. + // We therefore simply test each curve and only retain those that are + // accepted by SSL_CTX_set1_curves(). + + NID_X9_62_prime256v1, NID_secp256k1, NID_secp384r1, + NID_secp521r1, NID_sect283k1, NID_sect283r1, + NID_sect409k1, NID_sect409r1, NID_sect571k1, + NID_sect571r1, NID_brainpoolP256r1, NID_brainpoolP384r1, + NID_brainpoolP512r1 + }; + + // create a SSL context object +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX *ctx = SSL_CTX_new(SSLv23_method()); + if (ctx) SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3); +#else + SSL_CTX *ctx = SSL_CTX_new(TLS_method()); + if (ctx) SSL_CTX_set_security_level(ctx, 0); +#endif + if (ctx) + { + size_t numentries = sizeof(eclist) / sizeof(int); + ecvector.reserve(numentries); + for (size_t i = 0; i < numentries; ++i) + { + // try to set the given elliptic curve + if (SSL_CTX_set1_curves(ctx, &eclist[i], 1)) + { + // if successful, add to the list of supported elliptic curves + ecvector.push_back(eclist[i]); + } + } + // delete the SSL context object + SSL_CTX_free(ctx); + } +} + +#endif + + DcmTLSTransportLayer::DcmTLSTransportLayer() : DcmTransportLayer() , transportLayerContext(NULL) @@ -278,9 +339,14 @@ DcmTLSTransportLayer::DcmTLSTransportLayer(T_ASC_NetworkRole networkRole, const // We implement this by requesting SHA-256 OR BETTER, i.e. we also indicate // support for SHA-384 and SHA-512. - const int slist[] = {NID_sha256, EVP_PKEY_RSA, NID_sha256, EVP_PKEY_DSA, NID_sha256, EVP_PKEY_EC, - NID_sha384, EVP_PKEY_RSA, NID_sha384, EVP_PKEY_DSA, NID_sha384, EVP_PKEY_EC, - NID_sha512, EVP_PKEY_RSA, NID_sha512, EVP_PKEY_DSA, NID_sha512, EVP_PKEY_EC}; + const int slist[] = {NID_sha256, EVP_PKEY_RSA, NID_sha384, EVP_PKEY_RSA, NID_sha512, EVP_PKEY_RSA, +#if OPENSSL_VERSION_NUMBER >= 0x10101000L + // Connections between a client and a server that both use OpenSSL 1.1.1 + // will fail unless RSA-PSS is also offered as a signature algorithm. + NID_sha256, EVP_PKEY_RSA_PSS, NID_sha384, EVP_PKEY_RSA_PSS, NID_sha512, EVP_PKEY_RSA_PSS, +#endif + NID_sha256, EVP_PKEY_DSA, NID_sha384, EVP_PKEY_DSA, NID_sha512, EVP_PKEY_DSA, + NID_sha256, EVP_PKEY_EC, NID_sha384, EVP_PKEY_EC, NID_sha512, EVP_PKEY_EC}; if (0 == SSL_CTX_set1_sigalgs(transportLayerContext, slist, sizeof(slist)/sizeof(int))) { @@ -294,23 +360,14 @@ DcmTLSTransportLayer::DcmTLSTransportLayer(T_ASC_NetworkRole networkRole, const // For interoperability, clients and servers SHOULD support the NIST P-256 (secp256r1) curve // (in OpenSSL this curve is called "prime256v1"). - // BCP 195: Curves of less than 192 bits SHOULD NOT be used. - // Actually we only enable curves with at least 256 bits in DCMTK, following NIST and BSI recommendations. - const int eclist[] = { - // The list of elliptic curves actually supported by OpenSSL 1.0.2 - // seems to be undocumented. See implementation of tls1_ec_nid2curve_id() - // for a list of supported NIDs. Here are all elliptic curves - // supported by OpenSSL 1.0.2 that have 256 or more bits. - NID_X9_62_prime256v1, NID_secp256k1, NID_secp384r1, - NID_secp521r1, NID_sect283k1, NID_sect283r1, - NID_sect409k1, NID_sect409r1, NID_sect571k1, - NID_sect571r1, NID_brainpoolP256r1, NID_brainpoolP384r1, - NID_brainpoolP512r1 - }; - - if (0 == SSL_CTX_set1_curves(transportLayerContext, eclist, sizeof(eclist)/sizeof(int))) + OFVector ecvector; + computeEllipticCurveList(ecvector); + if (ecvector.size() > 0) // only try to add the EC extension if we actually do support at least one curve { - DCMTLS_ERROR("unable to configure the TLS Supported Elliptic Curves extension."); + if (0 == SSL_CTX_set1_curves(transportLayerContext, &ecvector[0], OFstatic_cast(int, ecvector.size()))) + { + DCMTLS_ERROR("unable to configure the TLS Supported Elliptic Curves extension."); + } } #endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */ @@ -390,8 +447,15 @@ OFBool DcmTLSTransportLayer::setTempDHParameters(const char *filename) // DH key lengths of at least 2048 bits are RECOMMENDED. if (DH_bits(dh) < 2048) { - DCMTLS_WARN("Key length of Diffie-Hellman parameter file too short: RFC 7525 recommends at least 2048 bits, but the key in file '" + DCMTLS_WARN("Key length of Diffie-Hellman parameter file too short: RFC 7525 recommends at least 2048 bits, but the key in file '" << filename << "' is only " << DH_bits(dh) << " bits."); + if (ciphersuites.getTLSProfile() == TSP_Profile_BCP195_Extended) + { + // Extended BCP 195 profile: Reject DH parameter set, because it has less than 2048 bits + // This will cause the default DH parameter set (which is large enough) to be used + DH_free(dh); + return OFFalse; + } } SSL_CTX_set_tmp_dh(transportLayerContext,dh); DH_free(dh); /* Safe because of reference counts in OpenSSL */ @@ -462,11 +526,34 @@ DcmTransportLayerStatus DcmTLSTransportLayer::activateCipherSuites() SSL_CTX_set_options(transportLayerContext, ciphersuites.getTLSOptions()); +#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + // when compiling with OpenSSL 1.1.1 or newer, set the maximum supported + // TLS protocol version to TLS 1.2 if required (i.e. for the historic + // security profiles, which would otherwise show unexpected behaviour). + if (! ciphersuites.isTLS13Enabled()) + { + SSL_CTX_set_max_proto_version(transportLayerContext, TLS1_2_VERSION); + } +#endif } else return TCS_illegalCall; return TCS_ok; } +DcmTransportLayerStatus DcmTLSTransportLayer::setCipherSuites(const char *suites) +{ + if (transportLayerContext && suites) + { + if (!SSL_CTX_set_cipher_list(transportLayerContext, suites)) + { + const char *err = ERR_reason_error_string(ERR_peek_error()); + if (err) DCMTLS_ERROR("OpenSSL error: " << err); + return TCS_tlsError; + } + } else return TCS_illegalCall; + return TCS_ok; +} + DcmTLSTransportLayer::~DcmTLSTransportLayer() { clear(); @@ -608,10 +695,17 @@ DcmTransportConnection *DcmTLSTransportLayer::createConnection(DcmNativeSocketTy SSL *newConnection = SSL_new(transportLayerContext); if (newConnection) { - // On Win64, the following line will cause a warning because the native - // type for sockets there is 64-bit, and OpenSSL uses a 32-bit int file descriptor. - // This should be fixed in OpenSSL, there is nothing we can do here. - SSL_set_fd(newConnection, openSocket); + int s = OFstatic_cast(int, openSocket); + if (openSocket != OFstatic_cast(DcmNativeSocketType, s)) + { + // On Win64, the native type for sockets there is an unsigned 64-bit integer, + // and OpenSSL uses a signed 32-bit int file descriptor. + // This should be fixed in OpenSSL, there is nothing we can do here + // except to check whether the type conversion truncates the value and, + // in this case, issue an error message. + DCMTLS_ERROR("Conversion of 64-bit socket type to int in OpenSSL API causes loss of information."); + } + SSL_set_fd(newConnection, s); return new DcmTLSConnection(openSocket, newConnection); } } diff --git a/dcmtls/libsrc/tlsopt.cc b/dcmtls/libsrc/tlsopt.cc index 6839fe2b..5fc8fd77 100644 --- a/dcmtls/libsrc/tlsopt.cc +++ b/dcmtls/libsrc/tlsopt.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2017-2018, OFFIS e.V. + * Copyright (C) 2017-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -22,7 +22,7 @@ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ #include "dcmtk/dcmtls/tlsopt.h" -#include "dcmtk/ofstd/ofcmdln.h" +#include "dcmtk/ofstd/ofconapp.h" #include "dcmtk/dcmtls/tlscond.h" #include "dcmtk/dcmnet/assoc.h" /* for ASC_setTransportLayer() */ @@ -90,6 +90,7 @@ void DcmTLSOptions::addTLSCommandlineOptions(OFCommandLine& cmd) cmd.addSubGroup("security profile:"); cmd.addOption("--profile-bcp195", "+px", "BCP 195 TLS Profile (default)"); cmd.addOption("--profile-bcp195-nd", "+py", "Non-downgrading BCP 195 TLS Profile"); + cmd.addOption("--profile-bcp195-ex", "+pz", "Extended BCP 195 TLS Profile"); if (csh.cipher3DESsupported()) { cmd.addOption("--profile-basic", "+pb", "Basic TLS Secure Transport Connection Profile\n(retired)"); @@ -103,7 +104,7 @@ void DcmTLSOptions::addTLSCommandlineOptions(OFCommandLine& cmd) cmd.addSubGroup("ciphersuite:"); cmd.addOption("--list-ciphers", "+cc", "show list of supported TLS ciphersuites and exit", OFCommandLine::AF_Exclusive); cmd.addOption("--cipher", "+cs", 1, "[c]iphersuite name: string", - "add ciphersuite to list of negotiated suites"); + "add ciphersuite to list of negotiated suites\n(not with --profile-bcp195-ex)"); if (opt_networkRole != NET_REQUESTOR) { // this command line options only makes sense for association acceptors (TLS servers) @@ -240,6 +241,11 @@ void DcmTLSOptions::parseArguments(OFConsoleApplication& app, OFCommandLine& cmd app.checkDependence("--profile-bcp195-nd", tlsopts, opt_secureConnection); opt_tlsProfile = TSP_Profile_BCP195_ND; } + if (cmd.findOption("--profile-bcp195-ex")) + { + app.checkDependence("--profile-bcp195-ex", tlsopts, opt_secureConnection); + opt_tlsProfile = TSP_Profile_BCP195_Extended; + } if (csh.cipher3DESsupported()) { if (cmd.findOption("--profile-basic")) @@ -270,7 +276,10 @@ void DcmTLSOptions::parseArguments(OFConsoleApplication& app, OFCommandLine& cmd if (cmd.findOption("--add-cert-dir", 0, OFCommandLine::FOM_First)) app.checkDependence("--add-cert-dir", tlsopts, opt_secureConnection); if (cmd.findOption("--cipher", 0, OFCommandLine::FOM_First)) + { app.checkDependence("--cipher", tlsopts, opt_secureConnection); + app.checkConflict("--cipher", "--profile-bcp195-ex", (opt_tlsProfile == TSP_Profile_BCP195_Extended)); + } #endif } @@ -315,9 +324,6 @@ OFCondition DcmTLSOptions::createTransportLayer( } while (cmd.findOption("--add-cert-dir", 0, OFCommandLine::FOM_Next)); } - if (opt_dhparam && ! (tLayer->setTempDHParameters(opt_dhparam))) - DCMTLS_WARN("unable to load temporary DH parameter file '" << opt_dhparam << "', ignoring"); - if (opt_doAuthenticate) { if (opt_passwd) @@ -351,6 +357,11 @@ OFCondition DcmTLSOptions::createTransportLayer( if (TCS_ok != tLayer->activateCipherSuites()) return DCMTLS_EC_FailedToSetCiphersuites; + // Loading of DH parameters should happen after the call to setTLSProfile() + // because otherwise we cannot check profile specific restrictions + if (opt_dhparam && ! (tLayer->setTempDHParameters(opt_dhparam))) + DCMTLS_WARN("unable to load temporary DH parameter file '" << opt_dhparam << "', ignoring"); + tLayer->setCertificateVerification(opt_certVerification); if (net) @@ -397,7 +408,7 @@ OFBool DcmTLSOptions::secureConnectionRequested() const #endif } -DcmTLSTransportLayer *DcmTLSOptions::getTransportLayer() +DcmTransportLayer *DcmTLSOptions::getTransportLayer() { #ifdef WITH_OPENSSL return tLayer; diff --git a/dcmtls/libsrc/tlsscu.cc b/dcmtls/libsrc/tlsscu.cc index bc798d01..8ee25285 100644 --- a/dcmtls/libsrc/tlsscu.cc +++ b/dcmtls/libsrc/tlsscu.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2010-2018, OFFIS e.V. + * Copyright (C) 2010-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -43,8 +43,7 @@ DcmTLSSCU::DcmTLSSCU() : m_passwd(NULL), m_readSeedFile(""), m_writeSeedFile(""), - m_certVerification(DCV_requireCertificate), - m_dhparam("") + m_certVerification(DCV_requireCertificate) { } @@ -63,8 +62,7 @@ DcmTLSSCU::DcmTLSSCU(const OFString& peerHost, m_passwd(NULL), m_readSeedFile(""), m_writeSeedFile(""), - m_certVerification(DCV_requireCertificate), - m_dhparam("") + m_certVerification(DCV_requireCertificate) { setPeerHostName(peerHost); setPeerAETitle(peerAETitle); @@ -122,13 +120,6 @@ OFCondition DcmTLSSCU::initNetwork() } } - /* Initialize Diffie-Hellman parameters from file if given */ - if (!m_dhparam.empty() && cond.good()) - { - if (!m_tLayer->setTempDHParameters(m_dhparam.c_str())) - cond = EC_IllegalCall; // TODO: need to find better error code - } - /* Set whether SCU should check the SCP's certificate for validity */ if (cond.good()) m_tLayer->setCertificateVerification(m_certVerification); @@ -276,12 +267,6 @@ void DcmTLSSCU::setPeerCertVerification(const DcmCertificateVerification cert) } -void DcmTLSSCU::setDHParam(const OFString& dhParam) -{ - m_dhparam = dhParam; -} - - OFBool DcmTLSSCU::getAuthenticationParams(OFString& privKeyFile, OFString& certFile, const char*& passphrase, @@ -334,9 +319,10 @@ OFString DcmTLSSCU::getWriteSeedFile() const } -OFString DcmTLSSCU::getDHParam() const +void DcmTLSSCU::setDHParam(const OFString& dhParam) { - return m_dhparam; + if (!m_tLayer->setTempDHParameters(dhParam.c_str())) + DCMTLS_WARN("unable to load temporary DH parameter file '" << dhParam << "', ignoring"); } #else diff --git a/dcmtls/tests/dcmtls_testsuite_generate.pl b/dcmtls/tests/dcmtls_testsuite_generate.pl deleted file mode 100755 index 4344b76d..00000000 --- a/dcmtls/tests/dcmtls_testsuite_generate.pl +++ /dev/null @@ -1,401 +0,0 @@ -#! /usr/bin/perl -# -# Copyright (C) 2018, OFFIS e.V. -# All rights reserved. See COPYRIGHT file for details. -# -# This software and supporting documentation were developed by -# -# OFFIS e.V. -# R&D Division Health -# Escherweg 2 -# D-26121 Oldenburg, Germany -# -# -# Module: dcmtls -# -# Author: Marco Eichelberg -# -# Purpose: -# This script generates the set of files needed to run the functional -# (integration) test suite for module dcmtls. -# This script requires a Linux/Posix system, but the generated files -# can also be used on other platforms such as Windows. -# - -# First we need to generate three certification authorities -&createNewCA("ca1", "DCMTK Test CA 1"); -system ("cp ca1/cacert.pem ./cacert1.pem"); -&createNewCA("ca2", "DCMTK Test CA 2"); -system ("cp ca2/cacert.pem ./cacert2.pem"); -&createNewCA("ca3", "DCMTK Test CA 3"); -system ("cp ca3/cacert.pem ./cacert3.pem"); -mkdir("cadir", 0755); -$cahash1 = `openssl x509 -hash -noout -in ./cacert1.pem`; -chop $cahash1; -$cahash2 = `openssl x509 -hash -noout -in ./cacert2.pem`; -chop $cahash2; - -# Generate directory with CA certificates -system ("cp ./cacert1.pem cadir/$cahash1.0"); -if ($cahash1 eq $cahash2) -{ - # both certificates have the same hash key. Unlikely but possible. - system ("cp ./cacert2.pem cadir/$cahash1.1"); -} else { - system ("cp ./cacert2.pem cadir/$cahash2.0"); -} - -# Now generate user certificates -# user 1 is a normal certificate/key pair -&createNewCertificate("ca1", "user1_cert.pem", "user1_key.pem", "Test User 1", "-nodes", "", 2048); -# this is a certificate/key pair encoded in DER format (instead of PEM). -# We create a PEM certificate and then convert to DER -&createNewCertificate("ca1", "user2_cert.pem", "user2_key.pem", "DER Test User", "-nodes", "", 2048); -system ("openssl x509 -in user2_cert.pem -out user2_cert.der -outform DER"); -system ("openssl pkey -in user2_key.pem -out user2_key.der -outform DER"); -unlink("user2_cert.pem"); -unlink("user2_key.pem"); -# user 3 uses an encrypted private key. The password is "PASSWORD". -&createNewCertificate("ca1", "user3_cert.pem", "user3_key.pem", "Test User 3", "-passout pass:PASSWORD", "", 2048); -# user 4 uses a weak 512-bit RSA private key. -&createNewCertificate("ca1", "user4_cert.pem", "user4_key.pem", "Test User 4 (512-bit RSA key)", "-nodes", "", 512); -# user 5 is a certificate that is signed with MD5, a weak hash key -&createNewCertificate("ca1", "user5_cert.pem", "user5_key.pem", "Test User 5 (MD5 digest)", "-nodes", "-md md5", 2048); -# ca2user is a certificate/key pair issued by CA 2 -&createNewCertificate("ca2", "ca2user_cert.pem", "ca2user_key.pem", "CA2 Test User 1", "-nodes", "", 2048); -# ca3user is a certificate/key pair issued by CA 3 -&createNewCertificate("ca3", "ca3user_cert.pem", "ca3user_key.pem", "CA3 Test User 1", "-nodes", "", 2048); - -# Generate other files needed - -# A file with 1024 random bits for seeding the PRNG -system ("openssl rand -out randseed.bin 1024"); - -# A Diffie-Hellman parameter set with 2048 bits -system ("openssl dhparam -out dhparam2048.pem 2048"); - -# A weak Diffie-Hellman parameter set with only 512 bits -system ("openssl dhparam -out dhparam512.pem 512"); - -# -# createNewCertificate(string cadir, string certfile, string certkey) -# creates a new key pair consisting of a private key file and a certificate file -# signed by the CA. -# @param ca_directory directory of the CA -# @param certfile certificate file to be written -# @param certkey private key file to be written -# @param subject certificate subject name (CN) -# @req_options additional parameters for openssl req -# @ca_options additional parameters for openssl ca -# -sub createNewCertificate -{ - local($ca_directory, $certfile, $certkey, $subject, $req_options, $ca_options, $bits) = @_; - local($days) = 3652; - if (! -d "$ca_directory") - { - die "error: $ca_directory not found, bailing out."; - } - system ("openssl req -config ${ca_directory}/openssl.cnf $req_options -subj '/C=DE/ST=Niedersachsen/O=OFFIS/OU=OFFIS DICOM Team/emailAddress=dicom\@offis.de/CN=$subject' -newkey rsa:$bits -keyout $certkey -out ${ca_directory}/private/tempreq.pem"); - system ("openssl ca -config ${ca_directory}/openssl.cnf $ca_options -policy policy_anything -in ${ca_directory}/private/tempreq.pem -out $certfile -days $days -batch"); - unlink "${ca_directory}/private/tempreq.pem"; - @newfiles = `cd ${ca_directory}/newcerts; ls *.pem`; - foreach (@newfiles) - { - chop; - system("mv ${ca_directory}/newcerts/$_ ${ca_directory}/certs"); - system("cd ${ca_directory}/certs; ln -s $_ `openssl x509 -hash -noout -in $_`.0"); - } - return $?; -} - - -# createNewCA(directory, CA name) -# creates all files required for a new Certification Authority -# @param directory directory to be created for the new CA, must not yet exist. -# -sub createNewCA -{ - local($ca_directory, $ca_name) = @_; - local($days) = 7305; # 20 years - local($bits) = 4096; # RSA key length - if (-e "$ca_directory") - { - print "warning: $ca_directory already exists, skipping CA creation step.\n"; - return; - } - mkdir($ca_directory, 0700); - mkdir("${ca_directory}/certs", 0700); - mkdir("${ca_directory}/crl", 0700); - mkdir("${ca_directory}/newcerts", 0700); - mkdir("${ca_directory}/private", 0700); - open OUT, ">${ca_directory}/serial"; - print OUT "01\n"; - close OUT; - open OUT, ">${ca_directory}/index.txt"; - close OUT; - &createNewConfigFile($ca_directory); - system ("openssl rand -out ${ca_directory}/private/randseed.bin 1024"); - system ("openssl req -config ${ca_directory}/openssl.cnf -newkey rsa:$bits -x509 -subj '/C=DE/ST=Niedersachsen/O=OFFIS/OU=$ca_name/emailAddress=dicom\@offis.de' -nodes -keyout ${ca_directory}/private/cakey.pem -out ${ca_directory}/cacert.pem -days $days"); - system ("cp ${ca_directory}/cacert.pem ${ca_directory}/certs/00.pem"); - system ("cd ${ca_directory}/certs; ln -s 00.pem `openssl x509 -hash -noout -in 00.pem`.0"); - return $?; -} - -# -# createNewConfigFile(directory) -# creates new default configuration file named openssl.cnf in CA directory. -# @param directory CA directory. -# -sub createNewConfigFile -{ - local($ca_directory) = @_; - open OUT, ">${ca_directory}/openssl.cnf"; - -##################################################################### -print OUT <echoscu_version.log"); -open(ECHOSCUFILE, ") -{ - chomp $row; - if ($row =~ /OpenSSL/) { printf("OpenSSL version: %s\n\n", substr($row,2)); $with_openssl = 1; } -} -close INFILE; -if (! $with_openssl) -{ - print "DCMTK compiled without OpenSSL support. Stopping dcmtls test suite\n"; - exit 0; -} - -print "Test 01: unencrypted communication: "; -$pid = &startBackgroundProcess("$storescp -d $tlsport >test01_server_out.log 2>test01_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu localhost -d $tlsport >test01_client_out.log 2>test01_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 02: attempt TLS connection to unencrypted server: "; -$pid = &startBackgroundProcess("$storescp -d $tlsport >test02_server_out.log 2>test02_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla localhost $tlsport >test02_client_out.log 2>test02_client_err.log"); -if (($result != 0) && (&findInFiles("Unrecognized PDU type", "test02_server_err.log", "test02_server_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 03: attempt unencrypted connection to TLS server: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem $tlsport >test03_server_out.log 2>test03_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d localhost $tlsport >test03_client_out.log 2>test03_client_err.log"); -# different openssl versions report different error messages here -if (($result != 0) && ( - (&findInFiles("wrong version number", "test03_server_err.log", "test03_server_out.log")) || - (&findInFiles("unknown protocol", "test03_server_err.log", "test03_server_out.log")))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 04: connect with anonymous TLS to TLS server accepting such connections: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test04_server_out.log 2>test04_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla -ic localhost $tlsport >test04_client_out.log 2>test04_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 05: connect with valid certificate to TLS server: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test05_server_out.log 2>test05_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user1_key.pem user1_cert.pem -ic localhost $tlsport >test05_client_out.log 2>test05_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 06: connect with weak certificate (MD5 hash) to TLS server: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic +cf cacert1.pem $tlsport >test06_server_out.log 2>test06_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user5_key.pem user5_cert.pem -ic localhost $tlsport >test06_client_out.log 2>test06_client_err.log"); -# here we do not look at the return code because the result differs depending on the openssl version used. -# openssl 1.0.x will report a warning but run echoscu, while 1.1.x will refuse to use the certificate. -# The warning is printed in both cases, however, and this is what we look for. -if (&findInFiles("Certificate hash key not SHA-256", "test06_client_err.log", "test06_client_out.log")) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 07: connect with DER encoded certificate to TLS server: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test07_server_out.log 2>test07_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d -der +tls user2_key.der user2_cert.der -ic localhost $tlsport >test07_client_out.log 2>test07_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 08: use private key file protected with a password: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test08_server_out.log 2>test08_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user3_key.pem user3_cert.pem +pw PASSWORD -ic localhost $tlsport >test08_client_out.log 2>test08_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 09: use private key file protected with a password; use wrong password: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test09_server_out.log 2>test09_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user3_key.pem user3_cert.pem +pw WRONG_PASSWORD -ic localhost $tlsport >test09_client_out.log 2>test09_client_err.log"); -if (($result != 0) && (&findInFiles("Unable to load private TLS key", "test09_client_err.log", "test09_client_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 10: use private key file protected with a password; use null password: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test10_server_out.log 2>test10_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user3_key.pem user3_cert.pem --null-passwd -ic localhost $tlsport >test10_client_out.log 2>test10_client_err.log"); -if (($result != 0) && (&findInFiles("Unable to load private TLS key", "test10_client_err.log", "test10_client_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 11: use random seed file: "; -copy("randseed.bin", "randseed11.bin") || die "unable to copy randseed.bin"; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test11_server_out.log 2>test11_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d --seed randseed11.bin +tls user1_key.pem user1_cert.pem -ic localhost $tlsport >test11_client_out.log 2>test11_client_err.log"); -$digest1 = md5digest("randseed.bin"); -$digest2 = md5digest("randseed11.bin"); -unlink "randseed11.bin"; -if ($result == 0 && ($digest1 eq $digest2)) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 12: use and write back random seed file: "; -copy("randseed.bin", "randseed12.bin") || die "unable to copy randseed.bin"; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test12_server_out.log 2>test12_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d --seed randseed12.bin --write-seed +tls user1_key.pem user1_cert.pem -ic localhost $tlsport >test12_client_out.log 2>test12_client_err.log"); -$digest1 = md5digest("randseed.bin"); -$digest2 = md5digest("randseed12.bin"); -unlink "randseed12.bin"; -if ($result == 0 && ($digest1 ne $digest2)) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 13: use random seed file, write back to different file: "; -copy("randseed.bin", "randseed13.bin") || die "unable to copy randseed.bin"; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test13_server_out.log 2>test13_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -unlink "randseed13a.bin"; -$result = system("$echoscu -d --seed randseed13.bin +wf randseed13a.bin +tls user1_key.pem user1_cert.pem -ic localhost $tlsport >test13_client_out.log 2>test13_client_err.log"); -if (! -f "randseed13a.bin") -{ # output file was not created. This is a failure - &testFailed(); -} -else -{ - $digest1 = md5digest("randseed13.bin"); - $digest2 = md5digest("randseed13a.bin"); - unlink "randseed13.bin"; - unlink "randseed13a.bin"; - if ($result == 0 && ($digest1 ne $digest2)) { &testPassed(); } else { &testFailed(); } -} -&doKill($pid); -$tlsport++; - -print "Test 14: client verifies server certificate: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test14_server_out.log 2>test14_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user1_key.pem user1_cert.pem -rc +cf cacert1.pem localhost $tlsport >test14_client_out.log 2>test14_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 15: server provides certificate from unknown CA: "; -$pid = &startBackgroundProcess("$storescp -d +tls ca2user_key.pem ca2user_cert.pem -ic $tlsport >test15_server_out.log 2>test15_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user1_key.pem user1_cert.pem -rc +cf cacert1.pem localhost $tlsport >test15_client_out.log 2>test15_client_err.log"); -if (($result != 0) && (&findInFiles("certificate verify failed", "test15_client_err.log", "test15_client_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 16: server verifies client certificate: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -rc +cf cacert1.pem $tlsport >test16_server_out.log 2>test16_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user1_key.pem user1_cert.pem -rc +cf cacert1.pem localhost $tlsport >test16_client_out.log 2>test16_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 17: server tries to verify client certificate, but client uses anonymous TLS: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -rc +cf cacert1.pem $tlsport >test17_server_out.log 2>test17_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla -rc +cf cacert1.pem localhost $tlsport >test17_client_out.log 2>test17_client_err.log"); -if (($result != 0) && (&findInFiles("peer did not return a certificate", "test17_server_err.log", "test17_server_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 18: client uses certificate from unknown CA: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -rc +cf cacert1.pem $tlsport >test18_server_out.log 2>test18_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls ca2user_key.pem ca2user_cert.pem -rc +cf cacert1.pem localhost $tlsport >test18_client_out.log 2>test18_client_err.log"); -# different openssl versions report different error messages here -if (($result != 0) && ( - (&findInFiles("certificate verify failed", "test18_server_err.log", "test18_server_out.log")) || - (&findInFiles("no certificate returned", "test18_server_err.log", "test18_server_out.log")))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 19: server verifies client certificate only if present, client uses anonymous TLS: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -vc +cf cacert1.pem $tlsport >test19_server_out.log 2>test19_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla -rc +cf cacert1.pem localhost $tlsport >test19_client_out.log 2>test19_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 20: server verifies client certificate only if present, client sends certificate: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -vc +cf cacert1.pem $tlsport >test20_server_out.log 2>test20_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user1_key.pem user1_cert.pem -rc +cf cacert1.pem localhost $tlsport >test20_client_out.log 2>test20_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 21: server verifies client certificate only if present, client uses certificate from unknown CA: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -vc +cf cacert1.pem $tlsport >test21_server_out.log 2>test21_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls ca2user_key.pem ca2user_cert.pem -rc +cf cacert1.pem localhost $tlsport >test21_client_out.log 2>test21_client_err.log"); -# different openssl versions report different error messages here -if (($result != 0) && ( - (&findInFiles("certificate verify failed", "test21_server_err.log", "test21_server_out.log")) || - (&findInFiles("no certificate returned", "test21_server_err.log", "test21_server_out.log")))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 22: server uses a directory of CA certificates, client uses CA1 certificate: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -rc +cd cadir $tlsport >test22_server_out.log 2>test22_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user1_key.pem user1_cert.pem -rc +cf cacert1.pem localhost $tlsport >test22_client_out.log 2>test22_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 23: server uses a directory of CA certificates, client uses CA2 certificate: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -rc +cd cadir $tlsport >test23_server_out.log 2>test23_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls ca2user_key.pem ca2user_cert.pem -rc +cf cacert1.pem localhost $tlsport >test23_client_out.log 2>test23_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 24: server uses a directory of CA certificates, client uses certificate from unknown CA: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -rc +cd cadir $tlsport >test24_server_out.log 2>test24_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls ca3user_key.pem ca3user_cert.pem -rc +cf cacert1.pem localhost $tlsport >test24_client_out.log 2>test24_client_err.log"); -# different openssl versions report different error messages here -if (($result != 0) && ( - (&findInFiles("certificate verify failed", "test24_server_err.log", "test24_server_out.log")) || - (&findInFiles("no certificate returned", "test24_server_err.log", "test24_server_out.log")))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 25: server uses user-defined Diffie-Hellman parameter set: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem --dhparam dhparam2048.pem -ic $tlsport >test25_server_out.log 2>test25_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user1_key.pem user1_cert.pem -ic localhost $tlsport >test25_client_out.log 2>test25_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 26: server uses weak (512 bit) user-defined Diffie-Hellman parameter set: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem --dhparam dhparam512.pem -ic $tlsport >test26_server_out.log 2>test26_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user1_key.pem user1_cert.pem -ic localhost $tlsport >test26_client_out.log 2>test26_client_err.log"); -# here we do not look at the return code because the result differs depending on the openssl version used. -# openssl 1.1.x will report a warning but run echoscu, while 1.0.x will refuse to use the DH parameter set. -# The warning is printed in both cases, however, and this is what we look for. -if (&findInFiles("Key length of Diffie-Hellman parameter file too short", "test26_server_err.log", "test26_server_out.log")) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 27: connect with weak certificate (512-bit RSA) to TLS server: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test27_server_out.log 2>test27_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tls user4_key.pem user4_cert.pem -ic localhost $tlsport >test27_client_out.log 2>test27_client_err.log"); -# here we do not look at the return code because the result differs depending on the openssl version used. -# openssl 1.0.x will report a warning but run echoscu, while 1.1.x will refuse to use the certificate. -# The warning is printed in both cases, however, and this is what we look for. -if (&findInFiles("Key length of RSA public key too short", "test27_client_err.log", "test27_client_out.log")) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 28: client uses Basic TLS Secure Transport Connection Profile (3DES): "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test28_server_out.log 2>test28_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --profile-basic -ic localhost $tlsport >test28_client_out.log 2>test28_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 29: client uses Basic Profile (3DES), server uses Non-downgrading BCP 195 TLS Profile: "; -$pid = &startBackgroundProcess("$storescp -d --profile-bcp195-nd +tls user1_key.pem user1_cert.pem -ic $tlsport >test29_server_out.log 2>test29_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --profile-basic -ic localhost $tlsport >test29_client_out.log 2>test29_client_err.log"); -if (($result != 0) && (&findInFiles("no shared cipher", "test29_server_err.log", "test29_server_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 30: client uses AES TLS Secure Transport Connection Profile: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test30_server_out.log 2>test30_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --profile-aes -ic localhost $tlsport >test30_client_out.log 2>test30_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 31: client uses AES Profile, server uses Non-downgrading BCP 195 TLS Profile: "; -$pid = &startBackgroundProcess("$storescp -d --profile-bcp195-nd +tls user1_key.pem user1_cert.pem -ic $tlsport >test31_server_out.log 2>test31_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --profile-aes -ic localhost $tlsport >test31_client_out.log 2>test31_client_err.log"); -if (($result != 0) && (&findInFiles("no shared cipher", "test31_server_err.log", "test31_server_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 32: client uses BCP 195 Profile, server uses Non-downgrading BCP 195 TLS Profile: "; -$pid = &startBackgroundProcess("$storescp -d --profile-bcp195-nd +tls user1_key.pem user1_cert.pem -ic $tlsport >test32_server_out.log 2>test32_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --profile-bcp195 -ic localhost $tlsport >test32_client_out.log 2>test32_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 33: client uses Non-downgrading BCP 195 TLS Profile, server uses BCP 195 Profile: "; -$pid = &startBackgroundProcess("$storescp -d --profile-bcp195 +tls user1_key.pem user1_cert.pem -ic $tlsport >test33_server_out.log 2>test33_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --profile-bcp195-nd -ic localhost $tlsport >test33_client_out.log 2>test33_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 34: client uses NULL TLS Profile, server uses BCP 195 Profile: "; -$pid = &startBackgroundProcess("$storescp -d --profile-bcp195 +tls user1_key.pem user1_cert.pem -ic $tlsport >test34_server_out.log 2>test34_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --profile-null -ic localhost $tlsport >test34_client_out.log 2>test34_client_err.log"); -if (($result != 0) && (&findInFiles("no shared cipher", "test34_server_err.log", "test34_server_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 35: client and server use NULL TLS Profile: "; -$pid = &startBackgroundProcess("$storescp -d --profile-null +tls user1_key.pem user1_cert.pem -ic $tlsport >test35_server_out.log 2>test35_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --profile-null -ic localhost $tlsport >test35_client_out.log 2>test35_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 36: client lists supported ciphers: "; -$result = system("$echoscu --list-ciphers >test36_client_out.log 2>test36_client_err.log"); -if (($result == 0) && (&findInFiles("TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA", "test36_client_err.log", "test36_client_out.log"))) { &testPassed(); } else { &testFailed(); } - -print "Test 37: client adds non-recommended ciphersuite: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test37_server_out.log 2>test37_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --cipher TLS_RSA_WITH_AES_128_GCM_SHA256 -ic localhost $tlsport >test37_client_out.log 2>test37_client_err.log"); -if (($result == 0) && (&findInFiles("RFC 7525 recomments that such cipher suites should not be used", "test37_client_err.log", "test37_client_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 38: client adds NULL ciphersuite: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test38_server_out.log 2>test38_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --cipher TLS_RSA_WITH_NULL_SHA -ic localhost $tlsport >test38_client_out.log 2>test38_client_err.log"); -if (($result != 0) && (&findInFiles("Unencrypted ciphersuite 'TLS_RSA_WITH_NULL_SHA' not permitted", "test38_client_err.log", "test38_client_out.log"))) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Test 39: client adds CAMELLIA ciphersuite: "; -$pid = &startBackgroundProcess("$storescp -d +tls user1_key.pem user1_cert.pem -ic $tlsport >test39_server_out.log 2>test39_server_err.log"); -do { $result = system("$tcpclient localhost $tlsport >tcpclient.log"); } while ($result != 0); -$result = system("$echoscu -d +tla --cipher TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA -ic localhost $tlsport >test39_client_out.log 2>test39_client_err.log"); -if ($result == 0) { &testPassed(); } else { &testFailed(); } -&doKill($pid); -$tlsport++; - -print "Tests completed: $numPassed tests passed, $numFailed tests failed.\n"; -exit(0); - -############################################################################### - -sub testPassed -{ - print "passed.\n"; - $numPassed++; -} - -sub testFailed -{ - print "failed.\n"; - $numFailed++; -} - -# -# startBackgroundProcess(command) -# run command in separate process -# -sub startBackgroundProcess -{ - my $pid = fork(); - if ($pid) - { # Parent - return $pid; - } - elsif ($pid == 0) - { # Child - if (! $windows) - { - setpgrp(0,0); # set process group to process ID; this function is not available on Windows. - } - # this allows us to use kill '-TERM' to kill both the shell actually started by exec() - # and the real process (e.g. storescp) started from the shell, which has a different PID - # and is a child process of this one, i.e. inherits its process group ID. - exec(@_) || die("unable to execute background command"); - } - else - { # Unable to fork - die "Error: unable to fork."; - } -} - -# -# find line matching regular expression in a text file -# @param regex regular expression -# @param filename filename -# -sub findInFile -{ - local($regex, $filename) = @_; - open(INFILE, "<$filename") || die "unable to open file '$filename'"; - while (my $row = ) - { - chomp $row; - if ($row =~ /$regex/) { close INFILE; return 1; } - } - close INFILE; - return 0; -} - -# -# find line matching regular expression in two text files (for stdout and stderr) -# @param regex regular expression -# @param filename1 filename 1 -# @param filename2 filename 2 -# -sub findInFiles -{ - local($regex, $filename1, $filename2) = @_; - open(INFILE, "<$filename1") || die "unable to open file '$filename1'"; - while (my $row = ) - { - chomp $row; - if ($row =~ /$regex/) { close INFILE; return 1; } - } - close INFILE; - open(INFILE2, "<$filename2") || die "unable to open file '$filename2'"; - while (my $row = ) - { - chomp $row; - if ($row =~ /$regex/) { close INFILE2; return 1; } - } - close INFILE2; - return 0; -} - -# -# compute MD5 digest of a file -# @param filename filename -# -sub md5digest -{ - local($filename) = @_; - open (my $fh, '<', $filename) || die "unable to open file '$filename'"; - binmode ($fh); - local ($result) = Digest::MD5->new->addfile($fh)->hexdigest; - close ($fh); - return $result; -} - -# -# kill process group -# @param pid process ID -# -sub doKill -{ - local($pid) = @_; - # don't use kill on Windows, because here $pid will always point to the Perl interpreter, i.e. we'd kill ourselves. - if (! $windows) { kill '-TERM', $pid; } -} diff --git a/dcmtract/libsrc/Makefile.dep b/dcmtract/libsrc/Makefile.dep index 4f3bad29..41c5806d 100644 --- a/dcmtract/libsrc/Makefile.dep +++ b/dcmtract/libsrc/Makefile.dep @@ -43,22 +43,17 @@ trcmeasurement.o: trcmeasurement.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -118,11 +113,14 @@ trcmeasurement.o: trcmeasurement.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmtract/trctypes.h ../include/dcmtk/dcmtract/trcdef.h trcmodtractresults.o: trcmodtractresults.cc \ @@ -169,22 +167,17 @@ trcmodtractresults.o: trcmodtractresults.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -245,11 +238,14 @@ trcmodtractresults.o: trcmodtractresults.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/iodreferences.h \ ../include/dcmtk/dcmtract/trctrackset.h \ @@ -300,22 +296,17 @@ trcstatistic.o: trcstatistic.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -375,11 +366,14 @@ trcstatistic.o: trcstatistic.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmtract/trctypes.h ../include/dcmtk/dcmtract/trcdef.h trctrack.o: trctrack.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -426,22 +420,17 @@ trctrack.o: trctrack.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -504,22 +493,17 @@ trctrackset.o: trctrackset.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -579,11 +563,14 @@ trctrackset.o: trctrackset.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmtract/trctypes.h ../include/dcmtk/dcmtract/trcdef.h \ ../include/dcmtk/dcmtract/trctrack.h \ @@ -634,22 +621,17 @@ trctractographyresults.o: trctractographyresults.cc \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ @@ -707,11 +689,14 @@ trctractographyresults.o: trctractographyresults.cc \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \ ../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \ @@ -768,18 +753,6 @@ trctypes.o: trctypes.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmtract/trcdef.h diff --git a/dcmwlm/CMakeLists.txt b/dcmwlm/CMakeLists.txt index ae51efe3..e336dde0 100644 --- a/dcmwlm/CMakeLists.txt +++ b/dcmwlm/CMakeLists.txt @@ -5,6 +5,6 @@ project(dcmwlm) include_directories("${dcmwlm_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include" "${oflog_SOURCE_DIR}/include" "${oflog_SOURCE_DIR}/include" "${dcmdata_SOURCE_DIR}/include" "${dcmnet_SOURCE_DIR}/include" ${ZLIB_INCDIR}) # recurse into subdirectories -foreach(SUBDIR libsrc apps include data tests) +foreach(SUBDIR libsrc apps include docs data tests) add_subdirectory(${SUBDIR}) endforeach() diff --git a/dcmwlm/apps/Makefile.dep b/dcmwlm/apps/Makefile.dep index 46ce7289..8be69ed2 100644 --- a/dcmwlm/apps/Makefile.dep +++ b/dcmwlm/apps/Makefile.dep @@ -42,7 +42,7 @@ wlcefs.o: wlcefs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ @@ -51,14 +51,14 @@ wlcefs.o: wlcefs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmwlm/wltypdef.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmwlm/wldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ @@ -129,7 +129,7 @@ wlmscpfs.o: wlmscpfs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ ../../ofstd/include/dcmtk/ofstd/oflist.h \ @@ -138,14 +138,14 @@ wlmscpfs.o: wlmscpfs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmwlm/wltypdef.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmwlm/wldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h wlcefs.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ + ../../ofstd/include/dcmtk/ofstd/ofexit.h wlcefs.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/lst.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ diff --git a/dcmwlm/apps/wlcefs.cc b/dcmwlm/apps/wlcefs.cc index 69de0811..44d496b3 100644 --- a/dcmwlm/apps/wlcefs.cc +++ b/dcmwlm/apps/wlcefs.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2017, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -68,8 +68,9 @@ WlmConsoleEngineFileSystem::WlmConsoleEngineFileSystem( int argc, char *argv[], // dataSourcev - [in] Pointer to the dataSource object. // Return Value : none. : opt_returnedCharacterSet( RETURN_NO_CHARACTER_SET ), - opt_dfPath( "" ), opt_port( 0 ), opt_refuseAssociation( OFFalse ), - opt_rejectWithoutImplementationUID( OFFalse ), opt_sleepAfterFind( 0 ), opt_sleepDuringFind( 0 ), + opt_dfPath( "" ), opt_rfPath( "" ), opt_rfFormat( "#t.dump" ), opt_refuseAssociation( OFFalse ), + opt_rejectWithoutImplementationUID( OFFalse ), opt_sleepBeforeFindReq ( 0 ), + opt_sleepAfterFind( 0 ), opt_sleepDuringFind( 0 ), opt_maxPDU( ASC_DEFAULTMAXPDU ), opt_networkTransferSyntax( EXS_Unknown ), opt_failInvalidQuery( OFTrue ), opt_singleProcess( OFTrue ), opt_forkedChild( OFFalse ), opt_maxAssociations( 50 ), opt_noSequenceExpansion( OFFalse ), @@ -119,6 +120,7 @@ WlmConsoleEngineFileSystem::WlmConsoleEngineFileSystem( int argc, char *argv[], OFString opt5 = "[p]ath: string (default: "; opt5 += opt_dfPath; opt5 += ")"; + cmd->addOption("--data-files-path", "-dfp", 1, opt5.c_str(), "path to worklist data files" ); cmd->addSubGroup("handling of worklist files:"); cmd->addOption("--enable-file-reject", "-efr", "enable rejection of incomplete worklist files\n(default)"); @@ -131,6 +133,9 @@ WlmConsoleEngineFileSystem::WlmConsoleEngineFileSystem( int argc, char *argv[], cmd->addOption("--keep-char-set", "-csk", "return character set provided in file"); cmd->addSubGroup("other processing options:"); cmd->addOption("--no-sq-expansion", "-nse", "disable expansion of empty sequences in C-FIND\nrequest messages"); + cmd->addOption("--request-file-path", "-rfp", 1, "[p]ath: string", "path to store request files to"); + cmd->addOption("--request-file-format", "-rff", 1, "[f]ormat: string (default: #t.dump)", "request file name format"); + cmd->addGroup("network options:"); cmd->addSubGroup("preferred network transfer syntaxes:"); @@ -170,6 +175,7 @@ WlmConsoleEngineFileSystem::WlmConsoleEngineFileSystem( int argc, char *argv[], cmd->addOption("--refuse", "refuse association"); cmd->addOption("--reject", "reject association if no implement. class UID"); cmd->addOption("--no-fail", "don't fail on an invalid query"); + cmd->addOption("--sleep-before", 1, "[s]econds: integer", "sleep s seconds before find (default: 0)"); cmd->addOption("--sleep-after", 1, "[s]econds: integer", "sleep s seconds after find (default: 0)"); cmd->addOption("--sleep-during", 1, "[s]econds: integer", "sleep s seconds during find (default: 0)"); OFString opt3 = "set max receive pdu to n bytes (default: "; @@ -228,6 +234,12 @@ WlmConsoleEngineFileSystem::WlmConsoleEngineFileSystem( int argc, char *argv[], #endif if( cmd->findOption("--data-files-path") ) app->checkValue(cmd->getValue(opt_dfPath)); + if( cmd->findOption("--request-file-path") ) app->checkValue(cmd->getValue(opt_rfPath)); + if( cmd->findOption("--request-file-format") ) + { + app->checkDependence("--request-file-format", "--request-file-path", !opt_rfPath.empty()); + app->checkValue(cmd->getValue(opt_rfFormat)); + } cmd->beginOptionBlock(); if( cmd->findOption("--enable-file-reject") ) opt_enableRejectionOfIncompleteWlFiles = OFTrue; @@ -299,6 +311,7 @@ WlmConsoleEngineFileSystem::WlmConsoleEngineFileSystem( int argc, char *argv[], if( cmd->findOption("--refuse") ) opt_refuseAssociation = OFTrue; if( cmd->findOption("--reject") ) opt_rejectWithoutImplementationUID = OFTrue; if( cmd->findOption("--no-fail") ) opt_failInvalidQuery = OFFalse; + if( cmd->findOption("--sleep-before") ) app->checkValue(cmd->getValueAndCheckMin(opt_sleepBeforeFindReq, 0)); if( cmd->findOption("--sleep-after") ) app->checkValue(cmd->getValueAndCheckMin(opt_sleepAfterFind, 0)); if( cmd->findOption("--sleep-during") ) app->checkValue(cmd->getValueAndCheckMin(opt_sleepDuringFind, 0)); if( cmd->findOption("--max-pdu") ) app->checkValue(cmd->getValueAndCheckMinMax(opt_maxPDU, ASC_MINIMUMPDUSIZE, ASC_MAXIMUMPDUSIZE)); @@ -360,15 +373,35 @@ int WlmConsoleEngineFileSystem::StartProvidingService() // start providing the basic worklist management service WlmActivityManager *activityManager = new WlmActivityManager( - dataSource, opt_port, + dataSource, + opt_port, opt_refuseAssociation, opt_rejectWithoutImplementationUID, - opt_sleepAfterFind, opt_sleepDuringFind, - opt_maxPDU, opt_networkTransferSyntax, + opt_sleepBeforeFindReq, + opt_sleepAfterFind, + opt_sleepDuringFind, + opt_maxPDU, + opt_networkTransferSyntax, opt_failInvalidQuery, - opt_singleProcess, opt_maxAssociations, - opt_blockMode, opt_dimse_timeout, opt_acse_timeout, - opt_forkedChild, command_argc, command_argv ); + opt_singleProcess, + opt_maxAssociations, + opt_blockMode, + opt_dimse_timeout, + opt_acse_timeout, + opt_forkedChild, + command_argc, + command_argv ); + + if (!activityManager->setRequestFilePath(opt_rfPath, opt_rfFormat)) + { + // dump error if given directory is not sufficient + OFLOG_ERROR(wlmscpfsLogger, "Request file directory (" << opt_rfPath << ") does not exist or is not writable"); + // free memory + delete activityManager; + // return error + return( 1 ); + } + cond = activityManager->StartProvidingService(); if( cond.bad() ) { diff --git a/dcmwlm/apps/wlcefs.h b/dcmwlm/apps/wlcefs.h index a54e8496..549593d5 100644 --- a/dcmwlm/apps/wlcefs.h +++ b/dcmwlm/apps/wlcefs.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2010, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -42,12 +42,24 @@ class WlmConsoleEngineFileSystem WlmReturnedCharacterSetType opt_returnedCharacterSet; /// path to database files OFString opt_dfPath; + /// path to store request files + OFString opt_rfPath; + /// format for request files if stored. + /// Several placeholders can be used by(denoted by #):
+ /// \#a: calling application entity title of the peer SCU
+ /// \#c: called application entity title (AE title of worklist SCP application)
+ /// \#i: process id of the worklist SCP application process handling the request
+ /// \#p: patient ID if present, otherwise empty string
+ /// \#t: timestamp in the format YYYYMMDDhhmmssffffff
+ OFString opt_rfFormat; /// port on which this application is listening OFCmdUnsignedInt opt_port; /// indicates if incoming associations shall be refused or not OFBool opt_refuseAssociation; /// indicates if incoming associations shall be refused if no implementation class uid is specified OFBool opt_rejectWithoutImplementationUID; + /// indicates how many seconds the application is supposed to sleep before handling a find request + OFCmdUnsignedInt opt_sleepBeforeFindReq; /// indicates how long the application shall sleep after a find OFCmdUnsignedInt opt_sleepAfterFind; /// indicates how long the application shall sleep during a find @@ -80,7 +92,7 @@ class WlmConsoleEngineFileSystem OFCommandLine *cmd; /// number of command line arguments, needed for multiprocess mode on WIN32 int command_argc; - /// complete command line, needed for mulitprocess mode on WIN32 + /// complete command line, needed for multiprocess mode on WIN32 char **command_argv; /// data source which shall be queried on incoming C-Find RQ messages WlmDataSource *dataSource; diff --git a/dcmwlm/docs/CMakeLists.txt b/dcmwlm/docs/CMakeLists.txt new file mode 100644 index 00000000..ef5f8637 --- /dev/null +++ b/dcmwlm/docs/CMakeLists.txt @@ -0,0 +1,2 @@ +# declare installation files +install(FILES wlmsetup.txt DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT doc) diff --git a/dcmwlm/docs/Makefile.in b/dcmwlm/docs/Makefile.in index 65ccac5a..6f2b2384 100644 --- a/dcmwlm/docs/Makefile.in +++ b/dcmwlm/docs/Makefile.in @@ -11,10 +11,16 @@ configdir = @top_srcdir@/@configdir@ include $(configdir)/@common_makefile@ +files = wlmsetup.txt + all: install: + $(configdir)/mkinstalldirs $(DESTDIR)$(docdir) + for file in $(files); do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir) ;\ + done clean: rm -f $(TRASH) diff --git a/dcmwlm/docs/dcmwlm.dox b/dcmwlm/docs/dcmwlm.dox index 22cc7a59..8636192e 100644 --- a/dcmwlm/docs/dcmwlm.dox +++ b/dcmwlm/docs/dcmwlm.dox @@ -19,6 +19,11 @@ The main interface classes are: This module contains the following command line tool: \li \ref wlmscpfs +\section Files + +The following file provides further documentation: +\li \ref file_wlmsetup + \section Examples For an example of how to use the main interface classes of this module, see @@ -27,3 +32,8 @@ file 'wlcefs.cc' (making use of the WlmActivityManager class that manages all activities a corresponding SCP has to manage). */ + +/*! + \page file_wlmsetup wlmsetup.txt file + \verbinclude wlmsetup.txt +*/ diff --git a/dcmwlm/docs/wlmscpfs.man b/dcmwlm/docs/wlmscpfs.man index 8a559ee1..f096db7b 100644 --- a/dcmwlm/docs/wlmscpfs.man +++ b/dcmwlm/docs/wlmscpfs.man @@ -104,6 +104,12 @@ other processing options: -nse --no-sq-expansion disable expansion of empty sequences in C-FIND request messages + + -rfp --request-file-path [p]ath: string + path to store request files to + + -rff --request-file-format [f]ormat: string (default: #t.dump) + request file name format \endverbatim \subsection wlmscpfs_network_options network options @@ -166,6 +172,9 @@ other network options: --no-fail don't fail on an invalid query + --sleep-before [s]econds: integer + sleep s seconds before find (default: 0) + --sleep-after [s]econds: integer sleep s seconds after find (default: 0) @@ -217,6 +226,63 @@ which the SCP might have to return to an SCU in a C-FIND response message. Table K.6-1 in part 4 annex K of the DICOM standard lists all corresponding type 1 attributes (see column "Return Key Type"). +\subsection wlmscpfs_request_files Writing Request Files + +Providing option \e --request-file-path enables writing of the incoming C-FIND +requests into text files. The option value provides the target directory where +these files will be stored. All request files are stored in "dump" format as +provided by the \b dcmdump tool and are raw, i.e. they are written as they +arrive at \b wlmscpfs, without any tag processing applied by \b wlmscpfs. + +Writing request files allows users to "interactively" prepare the worklist +database (for \b wlmscpfs the worklist files served from the \e --data-file-path +directory) by watching the request file directory. Once a request file appears, +one needs some time to update worklist entries in the database. For that +reason it makes sense to use \e --request-file-path in combination with option +\e --sleep-before which lets users specify a certain amount of seconds that +\b wlmscpfs should wait before actually starting to check the worklist database. +Note that the request files written with \e --data-file-path are not +automatically deleted by \b wlmscpfs. + +If request files are enabled, \b wlmscpfs must automatically create file names +within the given directory. By default, the format is \.dump where +\ is in the format YYYYMMDDhhmmssffffff where: +- YYYY is the current year +- MM is the current month +- DD is the current day +- hh are the current hours (in 24 hour format) +- mm are the current minutes +- ss are the current seconds and +- ffffff is the fraction of the current second + +This should work as a default for most applications that would like to use +request files and want to ensure unique file names. If it is desired to change +this naming scheme, the option \e --request-file-format can be used. It +permits to specify the file naming pattern used by \e --request-file-path. + +For flexibility, the following placeholders can be used in the pattern provided +for \e --request-file-format: + +- \#a: calling application entity title of the peer SCU +- \#c: called application entity title (AE title of worklist SCP application) +- \#i: process id of the worklist SCP application process handling the request +- \#p: patient ID if present, otherwise empty string +- \#t: timestamp in the format YYYYMMDDhhmmssffffff + +The default (i.e. the value if \e --request-file-format is not explicitly set) +is \#t.dump resulting in the timestamp format described above. + +An example for such a user-defined format string would be +"request_#i_#a_#c.txt". The \#i makes most sense if \b wlmscpfs multi-process +mode is enabled via \e --fork option in order to ensure that simultaneous +request will not result in the same file name for both requests. + +It should be noted that the \#p placeholder uses the value of Patient ID +(0010,0020) from the request as is, i.e. if the string contains non-ASCII +characters, the file name computed by \b wlmscpfs might be broken and thus +cannot be written successfully or will look broken once written. Also, an empty +Patient ID is used as such, i.e. the \#p will be replaced with an empty string. + \subsection wlmscpfs_dicom_conformance DICOM Conformance The \b wlmscpfs application supports the following SOP Classes as an SCP: @@ -442,6 +508,6 @@ It is an error if no data dictionary can be loaded. \section wlmscpfs_copyright COPYRIGHT -Copyright (C) 1996-2017 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. +Copyright (C) 1996-2019 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ diff --git a/dcmwlm/docs/wlmsetup.txt b/dcmwlm/docs/wlmsetup.txt new file mode 100644 index 00000000..f3d713f2 --- /dev/null +++ b/dcmwlm/docs/wlmsetup.txt @@ -0,0 +1,69 @@ +===================================================================== +SETTING UP THE WORKLIST SCP +===================================================================== + +INTRODUCTION + +The DICOM Modality Worklist Management SCP component in DCMTK (wlmscpfs) +was originally developed for a public demonstration at the Computer +Assisted Radiology 1996 congress (CAR '96) as the first operational +demo implementation of a DICOM worklist server. + +In production use, one would expect a Worklist SCP to be part of an +information system such as a RIS or a HIS that is used to create, manage +and delete work items that can be queried over a DICOM interface by +modalities using the DICOM Worklist Management (MWL) service. DICOM MWL +does not offer any way of creating, modifying or deleting a worklist +entry. Since no such information system with DICOM support was available +at the time, a simple web-based user interface was devised that would +allow demo participants to create worklist entries, which could then be +queried using DICOM MWL. Interaction between the Web GUI (scripts +running on a web server) and the Worklist SCP was through a shared +directory. + +These scripts were unmaintained for a long time and have been removed +from DCMTK in 2015 (the last stable release that provided them was +DCMTK 3.6.0). This bit of history explains, however, the directory +structure used by the Worklist SCP. + +DIRECTORIES + +A single working directory must be created for the Worklist SCP, +for example /export/services/worklist. + +The Worklist SCP supports multiple "storage areas" that are selected +based upon the called application entity title (Called AETitle) when +an incoming DICOM network connection is accepted. For each storage +area, the following steps must be performed: + +- Create a subdirectory in the storage area directory, with + it's name identical to the application entity title, e.g.: + mkdir /export/services/worklist/AETITLE_1 + +- In the subdirectory, create a file named "lockfile", e.g.: + touch /export/services/worklist/AETITLE_1/lockfile + + This file is locked with a read lock by the Worklist SCP + before it tries to read Worklist entries from that directory. + The file should be locked with a write lock by any application + that wants to modify the content of that directory, prior to + the modification. This makes sure that Worklist SCP never "sees" + an inconsistent state of the directory or tries to read a file + that is currently being written to. + +WORKLIST FILES + +The Worklist SCP expects each worklist entry to be stored as a separate +file, in DICOM file format, using the filename extension ".wl". When +responding to an incoming Worklist Query, the Worklist SCP will read all +".wl" files from the subdirectory corresponding to the called AETitle +and will produce the query response from the content of these files. All +files with other file name extensions (or no extension) will be ignored. + +A set of sample files is provided with DCMTK. These are located in +dcmwlm/data/wlistdb/OFFIS. Convert each file to DICOM format by calling +dump2dcm wklist1.dump wklist1.wl (and so on for all ten files). +You can then use dcmwlm/data/wlistdb as a valid working directory +for the Worklist SCP, which contains a single storage area that +is accessibly by using OFFIS as the called aetitle in the query. + diff --git a/dcmwlm/include/dcmtk/dcmwlm/wlds.h b/dcmwlm/include/dcmtk/dcmwlm/wlds.h index fcde0bb3..5e7fc369 100644 --- a/dcmwlm/include/dcmtk/dcmwlm/wlds.h +++ b/dcmwlm/include/dcmtk/dcmwlm/wlds.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2017, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -22,6 +22,12 @@ #ifndef WlmDataSource_h #define WlmDataSource_h +#define WLM_CALLING_AETITLE_PLACEHOLDER "#a" +#define WLM_CALLED_AETITLE_PLACEHOLDER "#c" +#define WLM_TIMESTAMP_PLACEHOLDER "#t" +#define WLM_PATIENT_ID_PLACEHOLDER "#p" +#define WLM_PROCESS_ID_PLACEHOLDER "#i" + #include "dcmtk/config/osconfig.h" #include "dcmtk/dcmwlm/wltypdef.h" #include "dcmtk/dcmdata/dcdatset.h" @@ -48,6 +54,8 @@ class DCMTK_DCMWLM_EXPORT WlmDataSource /// indicates if the application shall fail on an invalid C-Find RQ message OFBool failOnInvalidQuery; + /// calling AE Title + OFString callingApplicationEntityTitle; /// called AE title OFString calledApplicationEntityTitle; /// the search mask which is contained in the C-Find RQ message @@ -341,16 +349,16 @@ class DCMTK_DCMWLM_EXPORT WlmDataSource */ virtual OFCondition ConnectToDataSource() = 0; - /** Disconnects from the data source. - * @return Indicates if the disconnection was completed successfully. - */ - virtual OFCondition DisconnectFromDataSource() = 0; - /** Set value in member variable. * @param value The value to set. */ void SetCalledApplicationEntityTitle( const OFString& value ); + /** Disconnects from the data source. + * @return Indicates if the disconnection was completed successfully. + */ + virtual OFCondition DisconnectFromDataSource() = 0; + /** Set value in member variable. * @param value The value to set. */ diff --git a/dcmwlm/include/dcmtk/dcmwlm/wldsfs.h b/dcmwlm/include/dcmtk/dcmwlm/wldsfs.h index ed4f3b3c..7f38354a 100644 --- a/dcmwlm/include/dcmtk/dcmwlm/wldsfs.h +++ b/dcmwlm/include/dcmtk/dcmwlm/wldsfs.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2011, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by diff --git a/dcmwlm/include/dcmtk/dcmwlm/wlmactmg.h b/dcmwlm/include/dcmtk/dcmwlm/wlmactmg.h index 86c2b6f5..8d3419a2 100644 --- a/dcmwlm/include/dcmtk/dcmwlm/wlmactmg.h +++ b/dcmwlm/include/dcmtk/dcmwlm/wlmactmg.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2012, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -44,13 +44,15 @@ class DCMTK_DCMWLM_EXPORT WlmActivityManager OFCmdUnsignedInt opt_port; /// indicates if the application shall refuse any association OFBool opt_refuseAssociation; - /// indicates if the application shall reject associations without implementation class uids + /// indicates if the application shall reject associations without implementation class UIDs OFBool opt_rejectWithoutImplementationUID; + /// indicates how many seconds the application is supposed to sleep before handling a find request + OFCmdUnsignedInt opt_sleepBeforeFindReq; /// indicates how long the application shall sleep after a find OFCmdUnsignedInt opt_sleepAfterFind; /// indicates how long the application shall sleep during a find OFCmdUnsignedInt opt_sleepDuringFind; - /// max pdu size + /// max PDU size OFCmdUnsignedInt opt_maxPDU; /// preferred network transfer syntax E_TransferSyntax opt_networkTransferSyntax; @@ -79,10 +81,20 @@ class DCMTK_DCMWLM_EXPORT WlmActivityManager int numberOfSupportedAbstractSyntaxes; /// table of processes for non-single process mode OFList processTable; + /// the directory where to store request files to + OFString opt_requestFilePath; + /// the format used for the request file names. + /// Several placeholders can be used by(denoted by #) : + /// \#a: calling application entity title of the peer SCU + /// \#c: called application entity title (AE title of worklist SCP application) + /// \#i process id of the worklist SCP application process handling the request + /// \#p: patient ID if present, otherwise empty string + /// \ #t: timestamp in the format YYYYMMDDhhmmssffffff + OFString opt_requestFileFormat; /** This function takes care of receiving, negotiating and accepting/refusing an * association request. Additionally, it handles the request the association - * requesting application transmits after a connection isd established. + * requesting application transmits after a connection is established. * @param net Contains network parameters. */ OFCondition WaitForAssociation( T_ASC_Network *net ); @@ -94,7 +106,7 @@ class DCMTK_DCMWLM_EXPORT WlmActivityManager void CleanChildren(); /** This function negotiates a presentation context which will be used by this application - * and the other DICOM appliation that requests an association. + * and the other DICOM application that requests an association. * @param assoc The association (network connection to another DICOM application). */ OFCondition NegotiateAssociation( T_ASC_Association *assoc ); @@ -111,7 +123,7 @@ class DCMTK_DCMWLM_EXPORT WlmActivityManager */ void RemoveProcessFromTable( int pid ); - /** This function takes care of refusing an assocation request. + /** This function takes care of refusing an association request. * @param assoc The association (network connection to another DICOM application). * @param reason The reason why the association request will be refused. */ @@ -170,6 +182,7 @@ class DCMTK_DCMWLM_EXPORT WlmActivityManager * @param opt_portv The port on which the application is supposed to listen. * @param opt_refuseAssociationv Specifies if an association shall always be refused by the SCP. * @param opt_rejectWithoutImplementationUIDv Specifies if the application shall reject an association if no implementation class UID is provided by the calling SCU. + * @param opt_sleepBeforeFindReqv Specifies how many seconds the application is supposed to sleep before handling a C-FIND-Req. * @param opt_sleepAfterFindv Specifies how many seconds the application is supposed to sleep after having handled a C-FIND-Rsp. * @param opt_sleepDuringFindv Specifies how many seconds the application is supposed to sleep during the handling of a C-FIND-Rsp. * @param opt_maxPDUv Maximum length of a PDU that can be received in bytes. @@ -181,25 +194,26 @@ class DCMTK_DCMWLM_EXPORT WlmActivityManager * @param opt_dimse_timeoutv Specifies the timeout for DIMSE operations * @param opt_acse_timeoutv Specifies the timeout for ACSE operations * @param opt_forkedChildv Indicates, whether this process was "forked" from a parent process, default: false - * @param argcv Number of commandline arguments given - * @param argvv Complete command line + * @param argcv Number of commandline arguments given + * @param argvv Complete command line */ WlmActivityManager( - WlmDataSource *dataSourcev, - OFCmdUnsignedInt opt_portv, - OFBool opt_refuseAssociationv, - OFBool opt_rejectWithoutImplementationUIDv, - OFCmdUnsignedInt opt_sleepAfterFindv, - OFCmdUnsignedInt opt_sleepDuringFindv, - OFCmdUnsignedInt opt_maxPDUv, - E_TransferSyntax opt_networkTransferSyntaxv, - OFBool opt_failInvalidQueryv, - OFBool opt_singleProcessv, - int opt_maxAssociationsv, + WlmDataSource *dataSourcev, + OFCmdUnsignedInt opt_portv, + OFBool opt_refuseAssociationv, + OFBool opt_rejectWithoutImplementationUIDv, + OFCmdUnsignedInt opt_sleepBeforeFindReqv, + OFCmdUnsignedInt opt_sleepAfterFindv, + OFCmdUnsignedInt opt_sleepDuringFindv, + OFCmdUnsignedInt opt_maxPDUv, + E_TransferSyntax opt_networkTransferSyntaxv, + OFBool opt_failInvalidQueryv, + OFBool opt_singleProcessv, + int opt_maxAssociationsv, T_DIMSE_BlockingMode opt_blockModev, int opt_dimse_timeoutv, int opt_acse_timeoutv, - OFBool opt_forkedChild = OFFalse, + OFBool opt_forkedChildv = OFFalse, int argcv = 0, char *argvv[] = NULL ); @@ -213,6 +227,22 @@ class DCMTK_DCMWLM_EXPORT WlmActivityManager * @return Value that is supposed to be returned from main(). */ OFCondition StartProvidingService(); + + /** Set directory to store request files to. If set to empty path (default), + * request files are not stored. + * @param path Path to directory where request files should be stored to. + * Must exist and be writable for worklist application. + * @param format The format used for the request file names. + * Several placeholders can be used by (denoted by #):
+ * \#a: calling application entity title of the peer SCU
+ * \#c: called application entity title (AE title of worklist SCP application)
+ * \#i: process id of the worklist SCP application process handling the request
+ * \#p: patient ID if present, otherwise empty string
+ * \#t: timestamp in the format YYYYMMDDhhmmssffffff
+ * Default is #t.dump. + * @return OFTrue if path is accepted, OFFalse otherwise + */ + OFBool setRequestFilePath(const OFString& path="", const OFString& format="#t.dump"); }; #endif diff --git a/dcmwlm/libsrc/Makefile.dep b/dcmwlm/libsrc/Makefile.dep index 857ddc29..f2d16848 100644 --- a/dcmwlm/libsrc/Makefile.dep +++ b/dcmwlm/libsrc/Makefile.dep @@ -42,22 +42,18 @@ wlds.o: wlds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmwlm/wltypdef.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmwlm/wldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -88,19 +84,34 @@ wlds.o: wlds.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \ ../include/dcmtk/dcmwlm/wlds.h wldsfs.o: wldsfs.cc ../../config/include/dcmtk/config/osconfig.h \ - ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ - ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ - ../../dcmnet/include/dcmtk/dcmnet/cond.h \ - ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ - ../../ofstd/include/dcmtk/ofstd/ofstream.h \ - ../../ofstd/include/dcmtk/ofstd/ofthread.h \ ../../ofstd/include/dcmtk/ofstd/oftypes.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ ../../ofstd/include/dcmtk/ofstd/ofexport.h \ + ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ + ../../ofstd/include/dcmtk/ofstd/ofdate.h \ + ../../ofstd/include/dcmtk/ofstd/oftime.h \ + ../../oflog/include/dcmtk/oflog/internal/env.h \ + ../../oflog/include/dcmtk/oflog/config.h \ + ../../oflog/include/dcmtk/oflog/config/defines.h \ + ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ + ../../oflog/include/dcmtk/oflog/tstring.h \ + ../../oflog/include/dcmtk/oflog/tchar.h \ + ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ + ../../dcmnet/include/dcmtk/dcmnet/cond.h \ + ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ + ../../ofstd/include/dcmtk/ofstd/ofthread.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dndefine.h \ ../../dcmnet/include/dcmtk/dcmnet/dcompat.h \ @@ -108,18 +119,12 @@ wldsfs.o: wldsfs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \ ../../oflog/include/dcmtk/oflog/oflog.h \ ../../oflog/include/dcmtk/oflog/logger.h \ - ../../oflog/include/dcmtk/oflog/config.h \ - ../../oflog/include/dcmtk/oflog/config/defines.h \ - ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \ ../../oflog/include/dcmtk/oflog/loglevel.h \ ../../ofstd/include/dcmtk/ofstd/ofvector.h \ - ../../oflog/include/dcmtk/oflog/tstring.h \ - ../../oflog/include/dcmtk/oflog/tchar.h \ ../../oflog/include/dcmtk/oflog/spi/apndatch.h \ ../../oflog/include/dcmtk/oflog/appender.h \ ../../ofstd/include/dcmtk/ofstd/ofmem.h \ ../../ofstd/include/dcmtk/ofstd/ofutil.h \ - ../../ofstd/include/dcmtk/ofstd/oftraits.h \ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ ../../oflog/include/dcmtk/oflog/layout.h \ ../../oflog/include/dcmtk/oflog/streams.h \ @@ -131,30 +136,27 @@ wldsfs.o: wldsfs.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../include/dcmtk/dcmwlm/wltypdef.h \ - ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ - ../include/dcmtk/dcmwlm/wldefine.h \ + ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ + ../../dcmnet/include/dcmtk/dcmnet/lst.h \ + ../../dcmnet/include/dcmtk/dcmnet/dul.h \ + ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ + ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ + ../../dcmnet/include/dcmtk/dcmnet/dcuserid.h \ + ../../dcmnet/include/dcmtk/dcmnet/dntypes.h \ + ../../dcmnet/include/dcmtk/dcmnet/assoc.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ - ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \ + ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ + ../include/dcmtk/dcmwlm/wltypdef.h ../include/dcmtk/dcmwlm/wldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \ @@ -210,19 +212,15 @@ wlfsim.o: wlfsim.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../ofstd/include/dcmtk/ofstd/offile.h \ ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../ofstd/include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ - ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -292,11 +290,14 @@ wlfsim.o: wlfsim.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrsv.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvruv.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \ + ../../dcmdata/include/dcmtk/dcmdata/dcvrov.h \ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \ ../include/dcmtk/dcmwlm/wlfsim.h wlmactmg.o: wlmactmg.cc ../../config/include/dcmtk/config/osconfig.h \ @@ -308,6 +309,7 @@ wlmactmg.o: wlmactmg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ ../../ofstd/include/dcmtk/ofstd/ofstream.h \ ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofstrutl.h \ ../../dcmnet/include/dcmtk/dcmnet/dicom.h \ ../../dcmnet/include/dcmtk/dcmnet/cond.h \ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \ @@ -343,22 +345,18 @@ wlmactmg.o: wlmactmg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../include/dcmtk/dcmwlm/wltypdef.h \ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \ ../include/dcmtk/dcmwlm/wldefine.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \ @@ -383,5 +381,11 @@ wlmactmg.o: wlmactmg.cc ../../config/include/dcmtk/config/osconfig.h \ ../../dcmnet/include/dcmtk/dcmnet/dntypes.h \ ../../dcmnet/include/dcmtk/dcmnet/dimse.h \ ../../dcmnet/include/dcmtk/dcmnet/diutil.h \ + ../../ofstd/include/dcmtk/ofstd/ofdatime.h \ + ../../ofstd/include/dcmtk/ofstd/ofdate.h \ + ../../ofstd/include/dcmtk/ofstd/oftime.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \ - ../include/dcmtk/dcmwlm/wlmactmg.h + ../../oflog/include/dcmtk/oflog/internal/env.h \ + ../include/dcmtk/dcmwlm/wlmactmg.h \ + ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ + ../../ofstd/include/dcmtk/ofstd/ofexbl.h diff --git a/dcmwlm/libsrc/wlds.cc b/dcmwlm/libsrc/wlds.cc index b037635f..1bcc137c 100644 --- a/dcmwlm/libsrc/wlds.cc +++ b/dcmwlm/libsrc/wlds.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2017, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -53,7 +53,7 @@ WlmDataSource::WlmDataSource() // Task : Constructor. // Parameters : none. // Return Value : none. - : failOnInvalidQuery( OFTrue ), calledApplicationEntityTitle(""), + : failOnInvalidQuery( OFTrue ), callingApplicationEntityTitle(""), calledApplicationEntityTitle(""), identifiers( NULL ), errorElements( NULL ), offendingElements( NULL ), errorComment( NULL ), foundUnsupportedOptionalKey( OFFalse ), readLockSetOnDataSource( OFFalse ), noSequenceExpansion( OFFalse ), returnedCharacterSet( RETURN_NO_CHARACTER_SET ), matchingDatasets(), @@ -690,7 +690,7 @@ OFBool WlmDataSource::CheckMatchingKey( const DcmElement *elem ) PutOffendingElements( tag ); OFString message( "Invalid value for an attribute with VR=" ); message += DcmVR( elem->ident() ).getVRName(); - errorComment->putString( message.data(), message.size() ); + errorComment->putOFStringArray( message ); } } break; diff --git a/dcmwlm/libsrc/wldsfs.cc b/dcmwlm/libsrc/wldsfs.cc index 31fb1849..a2f28f16 100644 --- a/dcmwlm/libsrc/wldsfs.cc +++ b/dcmwlm/libsrc/wldsfs.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2018, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -27,9 +27,13 @@ BEGIN_EXTERN_C #include // for O_RDWR #endif END_EXTERN_C +#include "dcmtk/ofstd/oftypes.h" +#include "dcmtk/ofstd/ofstd.h" +#include "dcmtk/ofstd/ofdatime.h" +#include "dcmtk/oflog/internal/env.h" #include "dcmtk/dcmnet/dicom.h" +#include "dcmtk/dcmnet/dimse.h" #include "dcmtk/dcmwlm/wltypdef.h" -#include "dcmtk/ofstd/oftypes.h" #include "dcmtk/dcmdata/dcdatset.h" #include "dcmtk/dcmdata/dcsequen.h" #include "dcmtk/dcmdata/dcvrat.h" @@ -38,7 +42,6 @@ END_EXTERN_C #include "dcmtk/dcmdata/dcvrcs.h" #include "dcmtk/dcmwlm/wlds.h" #include "dcmtk/dcmwlm/wlfsim.h" -#include "dcmtk/ofstd/ofstd.h" #include "dcmtk/dcmwlm/wldsfs.h" @@ -50,8 +53,7 @@ WlmDataSourceFileSystem::WlmDataSourceFileSystem() // Task : Constructor. // Parameters : none. // Return Value : none. - : fileSystemInteractionManager( ), dfPath( "" ), enableRejectionOfIncompleteWlFiles( OFTrue ), - handleToReadLockFile( 0 ) + : fileSystemInteractionManager( ), dfPath( "" ), enableRejectionOfIncompleteWlFiles( OFTrue ), handleToReadLockFile( 0 ) { } @@ -104,6 +106,7 @@ OFCondition WlmDataSourceFileSystem::DisconnectFromDataSource() return( cond ); } + // ---------------------------------------------------------------------------- void WlmDataSourceFileSystem::SetDfPath( const OFString& value ) @@ -303,14 +306,14 @@ WlmDataSourceStatusType WlmDataSourceFileSystem::StartFindRequest( const DcmData << "============================="); // Set a read lock on the worklist files which shall be read from. - if( !SetReadlock() ) - return( WLM_REFUSED_OUT_OF_RESOURCES ); + if (!SetReadlock()) + return(WLM_REFUSED_OUT_OF_RESOURCES); // dump some information if required DCMWLM_INFO("Determining matching records from worklist files"); // Determine records from worklist files which match the search mask - unsigned long numOfMatchingRecords = fileSystemInteractionManager.DetermineMatchingRecords( identifiers ); + unsigned long numOfMatchingRecords = OFstatic_cast(unsigned long, fileSystemInteractionManager.DetermineMatchingRecords( identifiers )); // dump some information if required DCMWLM_INFO("Matching results: " << numOfMatchingRecords << " matching records found in worklist files"); diff --git a/dcmwlm/libsrc/wlmactmg.cc b/dcmwlm/libsrc/wlmactmg.cc index 05aa1acf..4d2f10bb 100644 --- a/dcmwlm/libsrc/wlmactmg.cc +++ b/dcmwlm/libsrc/wlmactmg.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1996-2018, OFFIS e.V. + * Copyright (C) 1996-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -25,6 +25,7 @@ #include "dcmtk/config/osconfig.h" #include "dcmtk/ofstd/ofcond.h" +#include "dcmtk/ofstd/ofstrutl.h" #include "dcmtk/dcmnet/dicom.h" #include "dcmtk/dcmwlm/wltypdef.h" #include "dcmtk/ofstd/oftypes.h" @@ -34,21 +35,23 @@ #include "dcmtk/dcmdata/dcdict.h" #include "dcmtk/dcmdata/dcdeftag.h" #include "dcmtk/dcmwlm/wlds.h" -#include "dcmtk/ofstd/ofcmdln.h" #include "dcmtk/dcmnet/assoc.h" #include "dcmtk/dcmnet/dimse.h" #include "dcmtk/dcmnet/diutil.h" #include "dcmtk/ofstd/ofstd.h" +#include "dcmtk/ofstd/ofdatime.h" #include "dcmtk/dcmdata/dcdicent.h" // needed by MSVC5 with STL +#include "dcmtk/oflog/internal/env.h" #include "dcmtk/dcmwlm/wlmactmg.h" + // ---------------------------------------------------------------------------- -// We need two global functions, because we need to pass a function pointer for a callback function +// We need three global functions, because we need to pass a function pointer for a callback function // to a certain function in dcmnet. This function pointer cannot point to an element function of the // above defined class, because dcmnet expects it to be a pointer to a global function. Hence, function -// FindCallback() needs to be global. Function AddStatusDetail() is used in FindCallback() that's why -// it is also defined as global. +// FindCallback() needs to be global. Function AddStatusDetail() and storeRequestFile() are used in +// FindCallback() that's why they are also defined as global. static void FindCallback( void *callbackData, OFBool cancelled, T_DIMSE_C_FindRQ * /*request*/, DcmDataset *requestIdentifiers, int responseCount, T_DIMSE_C_FindRSP *response, DcmDataset **responseIdentifiers, DcmDataset **statusDetail ); // Task : This function will try to select another record from a database which matches the @@ -79,6 +82,16 @@ static OFString AddStatusDetail( DcmDataset **statusDetail, const DcmElement *el // container. // Return Value : none. +static void storeRequestToFile(DcmDataset& request, const OFString& callingAE, const OFString& calledAE, const OFString& reqFilePath, const OFString& reqFileFormat); +// Task : Store request to file using the directory and file name format +// Parameters : request - [in] The incoming C-FIND request +// callingAE - [in] The peer's Calling AE Title +// calledAE - [in] Our AE Title +// reqFilePath - [in] The request file directory to write to +// reqFileFormat - [in] The request file name format to use +// Return Value: none + + // ---------------------------------------------------------------------------- WlmActivityManager::WlmActivityManager( @@ -86,6 +99,7 @@ WlmActivityManager::WlmActivityManager( OFCmdUnsignedInt opt_portv, OFBool opt_refuseAssociationv, OFBool opt_rejectWithoutImplementationUIDv, + OFCmdUnsignedInt opt_sleepBeforeFindReqv, OFCmdUnsignedInt opt_sleepAfterFindv, OFCmdUnsignedInt opt_sleepDuringFindv, OFCmdUnsignedInt opt_maxPDUv, @@ -106,6 +120,7 @@ WlmActivityManager::WlmActivityManager( // opt_portv - [in] The port on which the application is supposed to listen. // opt_refuseAssociationv - [in] Specifies if an association shall always be refused by the SCP. // opt_rejectWithoutImplementationUIDv - [in] Specifies if the application shall reject an association if no implementation class UID is provided by the calling SCU. +// opt_sleepBeforeFindReqv - [in] Specifies how many seconds the application is supposed to sleep before handling a C-FIND-Req. // opt_sleepAfterFindv - [in] Specifies how many seconds the application is supposed to sleep after having handled a C-FIND-Rsp. // opt_sleepDuringFindv - [in] Specifies how many seconds the application is supposed to sleep during the handling of a C-FIND-Rsp. // opt_maxPDUv - [in] Maximum length of a PDU that can be received in bytes. @@ -118,7 +133,7 @@ WlmActivityManager::WlmActivityManager( // argvv - [in/out] Holds complete commandline // Return Value : none. : dataSource( dataSourcev ), opt_port( opt_portv ), opt_refuseAssociation( opt_refuseAssociationv ), - opt_rejectWithoutImplementationUID( opt_rejectWithoutImplementationUIDv ), + opt_rejectWithoutImplementationUID( opt_rejectWithoutImplementationUIDv ), opt_sleepBeforeFindReq( opt_sleepBeforeFindReqv ), opt_sleepAfterFind( opt_sleepAfterFindv ), opt_sleepDuringFind( opt_sleepDuringFindv ), opt_maxPDU( opt_maxPDUv ), opt_networkTransferSyntax( opt_networkTransferSyntaxv ), opt_failInvalidQuery( opt_failInvalidQueryv ), @@ -164,6 +179,38 @@ WlmActivityManager::~WlmActivityManager() OFStandard::shutdownNetwork(); } +// ---------------------------------------------------------------------------- + +OFBool WlmActivityManager::setRequestFilePath(const OFString& path, const OFString& format) +// Date : March 08, 2019 +// Author : Michael Onken +// Task : Set the directory where to store request files to. +// Parameters : path - [in] The directory to store request files to. +// format - [in] the format for the request file names. +// Return Value : OFTrue if directory and format is accepted, OFFalse otherwise. +{ + if (!path.empty()) + { + if (OFStandard::dirExists(path) && OFStandard::isWriteable(path)) + { + opt_requestFilePath = path; + opt_requestFileFormat = format; + } + else + { + return OFFalse; + } + } + else + { + // disables option + opt_requestFilePath = path; + opt_requestFileFormat = format; + } + return OFTrue; +} + + // ---------------------------------------------------------------------------- OFCondition WlmActivityManager::StartProvidingService() @@ -738,10 +785,35 @@ struct WlmFindContextType // in wltypdef.h because it makes use of class WlmDataSource which is // unknown in wltypdef.h.) { + WlmFindContextType() : + dataSource(NULL), + priorStatus(WLM_SUCCESS), + opt_sleepBeforeFindReq(0), + opt_sleepDuringFind(0), + opt_reqFilePath(), + opt_reqFileFormat("#t.dump") + { + ourAETitle[0] = '\0'; + theirAETitle[0] = '\0'; + }; + WlmDataSource *dataSource; WlmDataSourceStatusType priorStatus; DIC_AE ourAETitle; + DIC_AE theirAETitle; + OFCmdUnsignedInt opt_sleepBeforeFindReq; OFCmdUnsignedInt opt_sleepDuringFind; + /// directory to store request files to (if enabled, otherwise empty) + OFString opt_reqFilePath; + /// request file name format: + /// Several placeholder can be used by(denoted by #) : + /// #a: calling application entity title of the peer Storage SCU + /// #c: called application entity title used by the peer Storage SCU to address storescp + /// #p: patient ID if present, otherwise empty string + /// #t: timestamp in the format YYYYMMDDhhmmssffffff + /// Default is #t.dump + OFString opt_reqFileFormat; + }; // ---------------------------------------------------------------------------- @@ -762,8 +834,11 @@ OFCondition WlmActivityManager::HandleFindSCP( T_ASC_Association *assoc, T_DIMSE WlmFindContextType context; context.dataSource = dataSource; context.priorStatus = WLM_PENDING; - ASC_getAPTitles( assoc->params, NULL, 0, context.ourAETitle, sizeof(context.ourAETitle), NULL, 0); + ASC_getAPTitles( assoc->params, context.theirAETitle, sizeof(context.theirAETitle), context.ourAETitle, sizeof(context.ourAETitle), NULL, 0); context.opt_sleepDuringFind = opt_sleepDuringFind; + context.opt_sleepBeforeFindReq = opt_sleepBeforeFindReq; + context.opt_reqFilePath = opt_requestFilePath; + context.opt_reqFileFormat = opt_requestFileFormat; // Dump some information if required. DCMWLM_INFO(DIMSE_dumpMessage(temp_str, *request, DIMSE_INCOMING, NULL, presID)); @@ -1027,11 +1102,12 @@ static void FindCallback( void *callbackData, OFBool cancelled, T_DIMSE_C_FindRQ WlmFindContextType *context = NULL; WlmDataSource *dataSource = NULL; OFCmdUnsignedInt opt_sleepDuringFind = 0; - + OFCmdUnsignedInt opt_sleepBeforeFindReq = 0; // Recover contents of context. context = (WlmFindContextType*)callbackData; dataSource = context->dataSource; opt_sleepDuringFind = context->opt_sleepDuringFind; + opt_sleepBeforeFindReq = context->opt_sleepBeforeFindReq; // Determine the data source's current status. dbstatus = context->priorStatus; @@ -1044,6 +1120,20 @@ static void FindCallback( void *callbackData, OFBool cancelled, T_DIMSE_C_FindRQ << DcmObject::PrintHelper(*requestIdentifiers) << OFendl << "============================="); + // If desired, dump request to file + if (!context->opt_reqFilePath.empty()) + { + DCMWLM_INFO("Storing request dataset to file"); + storeRequestToFile(*requestIdentifiers, context->theirAETitle, context->ourAETitle, context->opt_reqFilePath, context->opt_reqFileFormat); + } + + // If desired, sleep before actually trying to get answer for FIND request + if (opt_sleepBeforeFindReq > 0) + { + DCMWLM_INFO("SLEEPING (before evaluating find request): " << opt_sleepBeforeFindReq << " secs"); + OFStandard::sleep((unsigned int)opt_sleepBeforeFindReq); + } + // Determine the records that match the search mask. After this call, the // matching records will be available through dataSource->nextFindResponse(...).) dbstatus = dataSource->StartFindRequest( *requestIdentifiers ); @@ -1111,3 +1201,53 @@ static void FindCallback( void *callbackData, OFBool cancelled, T_DIMSE_C_FindRQ break; } } + +// ---------------------------------------------------------------------------- + +static void storeRequestToFile(DcmDataset& request, const OFString& callingAE, const OFString& calledAE, const OFString& reqFilePath, const OFString& reqFileFormat) +{ + OFString fileName = reqFileFormat; + // Called Application Entity Title + OFStringUtil::replace_all(fileName, WLM_CALLED_AETITLE_PLACEHOLDER, calledAE); + // Calling Application Entity Title + OFStringUtil::replace_all(fileName, WLM_CALLING_AETITLE_PLACEHOLDER, callingAE); + + // Process ID + int processID = dcmtk::log4cplus::internal::get_process_id(); + OFOStringStream convInt; + convInt << processID; + OFStringUtil::replace_all(fileName, WLM_PROCESS_ID_PLACEHOLDER, convInt.str().c_str()); + + // Timestamp + if (reqFileFormat.find("#t") != OFString_npos) + { + OFString ts; + OFDateTime dt; + dt.setCurrentDateTime(); + dt.getISOFormattedDateTime(ts, OFTrue /* seconds */, OFTrue /* fraction */, OFFalse /* no tz */, OFFalse /* no delimiters */, "" /* no date / time separator */); + OFStringUtil::replace_all(ts, ".", ""); + OFStringUtil::replace_all(fileName, WLM_TIMESTAMP_PLACEHOLDER, ts); + } + + // Patient ID goes last since it might contain placeholders again (".#x...)" + OFString patientID; + request.findAndGetOFStringArray(DCM_PatientID, patientID); + OFStringUtil::replace_all(fileName, WLM_PATIENT_ID_PLACEHOLDER, patientID); + + // Finally store file + STD_NAMESPACE ofstream outputStream; + OFString fullPath; + OFStandard::combineDirAndFilename(fullPath, reqFilePath, fileName, OFFalse /* no empty dir name, shouldnt happen anyway...*/); + outputStream.open(fullPath.c_str()); + if (outputStream.good()) + { + DcmObject::PrintHelper printer(request); + outputStream << printer; + outputStream.close(); + } + if (!outputStream) + { + /* report details on file i/o error */ + DCMWLM_ERROR("Could not write request to file: " << fileName << ": " << OFStandard::getLastSystemErrorCode().message()); + } +} diff --git a/dcmwlm/tests/Makefile.dep b/dcmwlm/tests/Makefile.dep index 9edca162..b2dc2019 100644 --- a/dcmwlm/tests/Makefile.dep +++ b/dcmwlm/tests/Makefile.dep @@ -42,20 +42,11 @@ wltest.o: wltest.cc ../../config/include/dcmtk/config/osconfig.h \ ../../oflog/include/dcmtk/oflog/logmacro.h \ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \ ../../oflog/include/dcmtk/oflog/tracelog.h \ - ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ - ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ - ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/offile.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofexit.h \ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \ ../../dcmnet/include/dcmtk/dcmnet/dul.h \ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \ ../../dcmnet/include/dcmtk/dcmnet/extneg.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ ../../dcmnet/include/dcmtk/dcmnet/dcuserid.h \ ../../dcmnet/include/dcmtk/dcmnet/dntypes.h \ ../include/dcmtk/dcmwlm/wltypdef.h \ @@ -74,6 +65,11 @@ wltest.o: wltest.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/dcmwlm/wldsfs.h ../include/dcmtk/dcmwlm/wlds.h \ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \ + ../../ofstd/include/dcmtk/ofstd/offile.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \ ../include/dcmtk/dcmwlm/wlfsim.h \ diff --git a/docs/ANNOUNCE.364 b/docs/ANNOUNCE.364 new file mode 100644 index 00000000..23851815 --- /dev/null +++ b/docs/ANNOUNCE.364 @@ -0,0 +1,159 @@ +ANNOUNCEMENT + +Version 3.6.4 of the OFFIS DCMTK (DICOM ToolKit) software is now available for +public release. This is a minor release that includes the following changes +over the previous version 3.6.3: + +- DCMTK 3.6.4 builds correctly on older and up-to-date versions of GNU gcc + (4.2.1 to 8.2.1) Clang (3.4.2 to 7.0.0), Microsoft Visual Studio (2005 to + 2017) and SunPro CC (5.14 and 5.15). + +- Tested with the following operating systems/environments: + + - Android on arm64 + - Cygwin on x86_64 + - FreeBSD on x86_64 + - Linux on x86_64 and x86 + - MacOS X on x86_64 + - NetBSD on x86_64 + - OpenBSD on x86_64 + - OpenIndiana on x86 + - Solaris on x86 + - Windows (and MinGW) on x86_64 and x86 + + For a complete list of tested systems and compilers, see the INSTALL file. + +- GNU Autoconf is still deprecated, running 'configure' emits a warning by + default. Support for GNU Autoconf will be removed after this release. + +- Updated data dictionary, SOP Class and Transfer Syntax UIDs for the recently + approved changes to the DICOM standard (i.e. Supplements and CPs), up to DICOM + standard release DICOM 2018d plus Supplement 188 (Multi-energy CT Images), + CP-1803 and CP-1809. + +- Added "dcmicmp", a new tool that reads two DICOM images, an original + "reference image" and a post-processed "test image" to which some kind of + processing such as a lossy image compression has been applied. dcmicmp + compares both images and computes several metrics that describe how similar + or different both images are. + +- Added new command line applications: cda2dcm and stl2dcm for encapsulation + of HL7 CDA documents and STL files into DICOM file format. Revised + implementation of pdf2dcm based on new class DcmEncapsulatedDocument. + +- The lossless JPEG decoder can now handle images compressed with the + Cornell codec, which creates invalid Huffman codes for 16-bit images. + +- The new class OFRandom implements a cryptographically secure pseudo + random number generator (PRNG) based on the ISAAC algorithm and its public + domain reference implementation by Bob Jenkins. + +- Major revision of the TLS code in DCMTK (module dcmtls and related command + line tools) implementing DICOM Supplement 204 "TLS Security Profiles". + Selection of TLS ciphersuites is now based on security profiles, and + DCMTK now implements the recommendations of BCP 195 / RFC 7525. + +- DCMTK can now be compiled with LibreSSL as an alternative to OpenSSL. + +- Updated automatically generated Context Group classes in "dcmsr" + (Structured Reporting) based on DICOM 2018d. Also updated the Code + definitions from the supported coding schemes such as DICOM, NCIt and UMLS. + +- Further enhanced DICOM Structured Reporting (SR) module "dcmsr": + + - Added support for included template TID 4019 (Algorithm Identification) to + the implementation of TID 1419 (ROI Measurements). + + - Added a document tree node filter that checks for the presence or absence + of a concept name, i.e. whether it is empty or not. + + - Added new and enhanced existing code examples for this module. + +- Added method getNumberOfValues() to all VR and other classes that are + derived from DcmObject (such as DcmItem). This new method always returns + the number of values currently stored in the corresponding object/element, + in contrast to getVM(), which sometimes returns the constant 1, or card(), + which is not available for all classes. + +- The ACSE timeout, e.g. passed to the various networking command line tools + using --acse-timeout, is now also used for the first PDU to be read. This is + another step towards cleaning up the timeout handling in dcmnet module. + +- Replaced all calls of strcpy() by OFStandard::strlcpy(), which should reduce + the possibility of buffer overflows. Also added OFStandard::snprintf() and + OFStandard::vsnprintf(), which should be used within the DCMTK as safe and + portable helper functions. + +- Fixed bug in dcmseg that produced broken binary Segmentation objects if the + number of pixels were not dividable by 8 for a single frame. + +- Enhanced Worklist SCP code to make use of existing classes and functions + instead of using its own "spaghetti" code for everything. This also + resolves issues with the Worklist SCP rejecting some legit Worklist queries + as its own verification functions were too strict. + +- Introduced a subset of std::filesystem to ofstd, currently providing the + classes OFpath, OFdirectory_entry and OFdirectory_iterator as portable + implementations for the respective C++17 STL classes. + +- The Windows implementation of class OFReadWriteLock class now uses Slim + Reader/Writer (SRW) Locks, which are available since Windows Vista, instead + of the older implementation based on a Mutex, a Semaphore and a counter, + because SRW locks are much faster. + +- Changed version numbering of shared objects. On Posix operating systems, + it now follows these guidelines: https://autotools.io/libtool/version.html. + +- Fixed various issues that occurred after the official 3.6.3 release. + See CHANGES file for details. + + +Many people have contributed to this new release of DCMTK, appearing here in +alphabetical order. Thank you very much for your support! + + Klaus Eisentraut + Andrey Fedorov + Florian Franzen + Christian Fremgen + Omar Ganiev + Daniel Grieger + Helmut Grohne + GwanYeong Kim + Peter Klotz + Mathieu Malaterre + Savvas Metallidis + Isaiah Norton + Lukas Raesenhoeft + Uli Schlachter + Max Smolens (github user msmolens) + Christian Wetzel + Gert Wollny + Sahab Zanjanizadeh + + Thomas Dement + Hans Johnson (GitHub user "hjmjohnson") + + Forum user "deepakt" + GitHub user "sercxjo" + +Members of the DCMTK Team who have worked on this release are +(in alphabetical order): + + Pedro Arizpe Gomez + Marco Eichelberg + Michael Onken + Joerg Riesmeier + Jan Schlamelcher + +Student associates: + + Nikolas Goldhammer + +Also see CREDITS file for projects and companies who have been generously +supporting DCMTK. + +The DCMTK software can be downloaded via: + + https://dicom.offis.de/dcmtk or https://www.dcmtk.org/ + +OFFIS e.V., Oldenburg, Germany, 2018-11-29 diff --git a/docs/CHANGES.365 b/docs/CHANGES.365 new file mode 100644 index 00000000..ab37fecf --- /dev/null +++ b/docs/CHANGES.365 @@ -0,0 +1,2221 @@ + +Release 3.6.5 (Public Minor Release - 2019-10-28) + +**** Changes from 2019.10.28 (schlamelcher) + +- Created CHANGES.365 for DCMTK release 3.6.5: + CHANGES.365 contains the Git commit history since DCMTK release 3.6.4. + Added: docs/CHANGES.365 + +- Updated man pages for DCMTK release 3.6.5. + Affects: doxygen/manpages/man1/cda2dcm.1 + doxygen/manpages/man1/dcm2json.1 + doxygen/manpages/man1/dcm2pdf.1 + doxygen/manpages/man1/dcm2pnm.1 + doxygen/manpages/man1/dcm2xml.1 + doxygen/manpages/man1/dcmcjpeg.1 + doxygen/manpages/man1/dcmcjpls.1 + doxygen/manpages/man1/dcmconv.1 + doxygen/manpages/man1/dcmcrle.1 + doxygen/manpages/man1/dcmdjpeg.1 + doxygen/manpages/man1/dcmdjpls.1 + doxygen/manpages/man1/dcmdrle.1 + doxygen/manpages/man1/dcmdspfn.1 + doxygen/manpages/man1/dcmdump.1 + doxygen/manpages/man1/dcmftest.1 + doxygen/manpages/man1/dcmgpdir.1 + doxygen/manpages/man1/dcmicmp.1 + doxygen/manpages/man1/dcmj2pnm.1 + doxygen/manpages/man1/dcml2pnm.1 + doxygen/manpages/man1/dcmmkcrv.1 + doxygen/manpages/man1/dcmmkdir.1 + doxygen/manpages/man1/dcmmklut.1 + doxygen/manpages/man1/dcmodify.1 + doxygen/manpages/man1/dcmp2pgm.1 + doxygen/manpages/man1/dcmprscp.1 + doxygen/manpages/man1/dcmprscu.1 + doxygen/manpages/man1/dcmpschk.1 + doxygen/manpages/man1/dcmpsmk.1 + doxygen/manpages/man1/dcmpsprt.1 + doxygen/manpages/man1/dcmpsrcv.1 + doxygen/manpages/man1/dcmpssnd.1 + doxygen/manpages/man1/dcmqridx.1 + doxygen/manpages/man1/dcmqrscp.1 + doxygen/manpages/man1/dcmqrti.1 + doxygen/manpages/man1/dcmquant.1 + doxygen/manpages/man1/dcmrecv.1 + doxygen/manpages/man1/dcmscale.1 + doxygen/manpages/man1/dcmsend.1 + doxygen/manpages/man1/dcmsign.1 + doxygen/manpages/man1/dcod2lum.1 + doxygen/manpages/man1/dconvlum.1 + doxygen/manpages/man1/drtdump.1 + doxygen/manpages/man1/dsr2html.1 + doxygen/manpages/man1/dsr2xml.1 + doxygen/manpages/man1/dsrdump.1 + doxygen/manpages/man1/dump2dcm.1 + doxygen/manpages/man1/echoscu.1 + doxygen/manpages/man1/findscu.1 + doxygen/manpages/man1/getscu.1 + doxygen/manpages/man1/img2dcm.1 + doxygen/manpages/man1/movescu.1 + doxygen/manpages/man1/pdf2dcm.1 + doxygen/manpages/man1/stl2dcm.1 + doxygen/manpages/man1/storescp.1 + doxygen/manpages/man1/storescu.1 + doxygen/manpages/man1/termscu.1 + doxygen/manpages/man1/wlmscpfs.1 + doxygen/manpages/man1/xml2dcm.1 + doxygen/manpages/man1/xml2dsr.1 + +- Updated version information for DCMTK release 3.6.5. + Affects: CMake/dcmtkPrepare.cmake + VERSION + +- Updated ANNOUNCE and INSTALL for DCMTK release 3.6.5. + Affects: ANNOUNCE + INSTALL + +- Updated Autoconf config for upcoming release 3.6.5: + Updated version information. + Updated Makefile dependencies. + Affects: config/configure + config/configure.in + dcmdata/apps/Makefile.dep + dcmdata/libi2d/Makefile.dep + dcmdata/libsrc/Makefile.dep + dcmdata/tests/Makefile.dep + dcmfg/libsrc/Makefile.dep + dcmfg/tests/Makefile.dep + dcmimage/apps/Makefile.dep + dcmimage/libsrc/Makefile.dep + dcmimgle/apps/Makefile.dep + dcmimgle/libsrc/Makefile.dep + dcmiod/libsrc/Makefile.dep + dcmjpeg/apps/Makefile.dep + dcmjpeg/libsrc/Makefile.dep + dcmjpls/apps/Makefile.dep + dcmjpls/libcharls/Makefile.dep + dcmjpls/libsrc/Makefile.dep + dcmnet/apps/Makefile.dep + dcmnet/libsrc/Makefile.dep + dcmpmap/libsrc/Makefile.dep + dcmpstat/apps/Makefile.dep + dcmpstat/libsrc/Makefile.dep + dcmpstat/tests/Makefile.dep + dcmqrdb/apps/Makefile.dep + dcmqrdb/libsrc/Makefile.dep + dcmrt/libsrc/Makefile.dep + dcmrt/tests/Makefile.dep + dcmseg/libsrc/Makefile.dep + dcmsign/apps/Makefile.dep + dcmsign/libsrc/Makefile.dep + dcmsr/apps/Makefile.dep + dcmsr/libcmr/Makefile.dep + dcmsr/libsrc/Makefile.dep + dcmsr/tests/Makefile.dep + dcmtls/libsrc/Makefile.dep + dcmtract/libsrc/Makefile.dep + dcmwlm/apps/Makefile.dep + dcmwlm/libsrc/Makefile.dep + dcmwlm/tests/Makefile.dep + oflog/libsrc/Makefile.dep + ofstd/libsrc/Makefile.dep + +**** Changes from 2019.10.24 (riesmeier) + +- Added explaining text on invalid XML entities. + Affects: dcmdata/docs/dcm2xml.man + dcmnet/docs/findscu.man + dcmsr/docs/dsr2xml.man + ofstd/include/dcmtk/ofstd/ofstd.h + +- Added new VR "OV" to list of bulk data VRs. + Affects: dcmdata/docs/dcm2xml.man + +**** Changes from 2019.10.23 (schlamelcher) + +- Updated DIMSE compatibility flag: + Updated DIMSE compatibility flag for the upcoming release, reflecting the + various changes in the networking code that were introduced since the last + release, e.g. corrected DIMSE status codes. + Affects: dcmnet/include/dcmtk/dcmnet/dul.h + +**** Changes from 2019.10.16 (riesmeier) + +- Fixed wrong return type of clone() method. + Affects: dcmdata/include/dcmtk/dcmdata/dcvrol.h + dcmdata/include/dcmtk/dcmdata/dcvrov.h + +**** Changes from 2019.10.14 (schlamelcher) + +- Made patching manpages platform independent: + The shell script "patchman.sh" and a call to "rm -f" was replaced with a CMake + script "patchman.cmake" such that this can now be run on Windows without + additional dependencies to a shell etc. + The existing script is kept for GNU Autconf that requires those dependencies + anyway and will be removed together with Autoconf support some time in the + future. + Added: doxygen/patchman.cmake + Affects: doxygen/CMakeLists.txt + +**** Changes from 2019.10.11 (riesmeier) + +- Added missing space character to log messages. + Affects: dcmdata/libsrc/dcencdoc.cc + +**** Changes from 2019.10.11 (arizpegomez) + +- Fix some spacing inconsistencies from last commit. + Affects: dcmdata/libsrc/dcencdoc.cc + +- Included dummy values for stl2dcm: + stl2dcm returned an error if no attributes of Enhanced General Module were + explicitly entered. Now dummy values are inserted and a warning is printed. + Thanks to Holger Franke for the request. + Affects: dcmdata/libsrc/dcencdoc.cc + +**** Changes from 2019.10.07 (onken) + +- Fixed skipping too much characters after replace. + Affects: ofstd/libsrc/ofstrutl.cc + ofstd/tests/tstrutl.cc + +**** Changes from 2019.10.07 (eichelberg) + +- Clarified documentation of dcmdjpeg --conv-never: + Thanks to Mathieu Malaterre for pointing + out the ambiguity in the documentation. + Affects: dcmjpeg/apps/dcmdjpeg.cc + dcmjpeg/docs/dcmdjpeg.man + +**** Changes from 2019.10.06 (onken) + +- Fixed issue with test crashing without dictionary. + Affects: dcmfg/libsrc/fgderimg.cc + dcmfg/tests/t_deriv_image.cc + dcmfg/tests/t_frame_content.cc + +**** Changes from 2019.10.01 (riesmeier) + +- Fixed "defined but not used function" warning: + Fixed warning on a function that is defined but not used when compiling + without multi-thread support. Reported by gcc with option -Wunused. + Affects: oflog/libsrc/threads.cc + +- Updated latest tested CMake version: + Updated information on latest CMake version that has been tested to "3.15.3". + Affects: CMake/dcmtkPrepare.cmake + +**** Changes from 2019.10.01 (arizpegomez) + +- Minor fixes to remove Doxygen warnings: + Removed discrepancies between doxygen parameter names and function names in + dcencdoc. + Affects: dcmdata/include/dcmtk/dcmdata/dcencdoc.h + +**** Changes from 2019.09.30 (riesmeier) + +- Added comment on missing VRs for this test. + Affects: dcmdata/tests/tvrcomp.cc + +- Fixed double declaration of local variable: + Fixed double declaration of local variable (reported by gcc -Wshadow). + Affects: dcmqrdb/apps/dcmqrscp.cc + dcmseg/libsrc/segdoc.cc + +- Fixed wrong VR for attribute RetrieveURL: + Fixed wrong VR used for attribute RetrieveURL (0040,E010) in a test program. + Instead of "UT" (Unlimited Text) the correct VR is "UR" (Universal Resource + Identifier or Universal Resource Locator). Now, both VRs are tested with a + valid example of a DICOM attribute. + Also removed German umlaut character from a test case (actually not needed + here) in order to avoid UTF-8 encoding of the source code file. + Affects: dcmdata/tests/tvrcomp.cc + +- Removed unused local variables from test program: + Removed unused local variables from test program (other other minor changes). + Affects: dcmdata/tests/tvrcomp.cc + +- Fixed unused parameter warning in test program: + Fixed unused parameter warning reported by gcc when compiling with option + -Wextra (or -Wunused-parameter). The parameter "vrName" is not needed any + longer. + Affects: dcmdata/tests/tvrcomp.cc + +**** Changes from 2019.09.30 (eichelberg) + +- Fixed DcmTLSOptions::getTransportLayer() signature: + DcmTLSOptions::getTransportLayer() now returns a pointer to + DcmTransportLayer and not to DcmTLSTransportLayer anymore. + Needed when compiling without OpenSSL support, because + in that case class DcmTLSTransportLayer is not defined. + Affects: dcmtls/include/dcmtk/dcmtls/tlsopt.h + dcmtls/libsrc/tlsopt.cc + +**** Changes from 2019.09.30 (schlamelcher) + +- Made building/installing of manpages configurable: + Building and installing of DCMTK's manpages is now an configurable option + (CMake) instead of being forcibly disabled on Windows. The defaults of this + option reflect the old behavior (OFF on Windows and ON everywhere else), but + Windows users are now free to enable it if they want it for whatever reason. + Affects: CMake/dcmtkPrepare.cmake + doxygen/CMakeLists.txt + +**** Changes from 2019.09.27 (onken) + +- Copy frame data when adding fractional frames: + Pixel data for fractional segmentations has not been copied, other than for + binary segmentations and other than documented. + Affects: dcmseg/libsrc/segdoc.cc + +**** Changes from 2019.09.26 (riesmeier) + +- Use non-zero exit code in case of error (findscu): + Made sure that a non-zero exit code is returned in case an error occurred + during association negotiation (i.e. during call of the performQuery() + method). Now using exit code 2 (for performQuery) and 3 (for dropNetwork) + in addition to 1 (all other errors). Future commits should make the use of + exit codes consistent throughout the DCMTK (also see DCMTK Feature #219). + This closes DCMTK Bug #899. + Affects: dcmnet/apps/findscu.cc + +**** Changes from 2019.09.26 (onken) + +- Correct error message if ass. negotiation fails: + If association negotiation failed, getscu always printed a message that + no acceptable presentation context could be found, even if the reason + was a different one (e.g. Called AE Title not recognized). This problem + has now been fixed by providing a better error message. + Affects: dcmnet/apps/getscu.cc + +**** Changes from 2019.09.26 (eichelberg) + +- Fixed memory leak in DiPNGPlugin::write(): + Thanks to DCMTK forum user AlexanderLysenko for the bug report and fix. + Affects: dcmimage/libsrc/dipipng.cc + +**** Changes from 2019.09.25 (riesmeier) + +- Fixed issue with loading external entities (XML): + Fixed possible security issue with loading external entities from an XML + file. Starting with libxml2 version 2.9.2, the parser loaded and substituted + external entities (read from file) in an XML document. By doing so, unwanted + data could be leaked (such as the contents of the file "/etc/passwd") when + parsing an appropriately prepared XML file. This type of security issue is + known as XML External Entity (XXE) injection. + The issue was not present in libxml2 version 2.9.1 and since the DCMTK does + not explicitly pass the parser flag XML_PARSE_NOENT to the xmlReadFile() + function, which is actually meant for this purpose, this should also be + true for older versions of the libxml2 library (but has not been tested). + Thanks to Maria Samoylova for the report, the + comprehensive analysis and for proprosing a (temporary) solution. + Affects: dcmdata/apps/xml2dcm.cc + dcmsr/libsrc/dsrxmld.cc + +**** Changes from 2019.09.16 (eichelberg) + +- JPEG-LS encoder now sets PlanarConfiguration to 0: + The JPEG-LS encoder now sets PlanarConfiguration to 0 for color images + as required by DICOM CP 1843. + This closes DCMTK issue #882. + Affects: dcmjpls/libsrc/djcodece.cc + +**** Changes from 2019.09.11 (riesmeier) + +- Get rid of unwanted HAVE_ITERATOR define: + With a recent commit, the define HAVE_ITERATOR was introduced for the + Autoconf generated "osconfig.h" file, i.e. in addition to the define + HAVE_ITERATOR_HEADER. This has been fixed now. + Affects: config/configure + config/configure.in + config/include/dcmtk/config/osconfig.h.in + +- Made "Define if..." comments more consistent: + Always start "Define if..." comments with a capital letter and end with a + period (end of the sentence). + Affects: config/aclocal.m4 + config/configure + config/configure.in + config/include/dcmtk/config/osconfig.h.in + +**** Changes from 2019.09.10 (schlamelcher) + +- Added missing member typedefs to OFIterator. + Affects: CMake/GenerateDCMTKConfigure.cmake + CMake/osconfig.h.in + config/aclocal.m4 + config/configure + config/configure.in + config/include/dcmtk/config/osconfig.h.in + ofstd/include/dcmtk/ofstd/oflist.h + +**** Changes from 2019.09.09 (eichelberg) + +- Added new macro OFopenmode_in_nocreate: + Defined a new macro OFopenmode_in_nocreate, which either expands to + ios::in or to ios::in|ios::nocreate, if the historic nocreate flag is + supported on the platform. All conditional code checking for + ios::nocreate has been replaced to use the new macro, which reduces code + duplication. + Affects: dcmdata/apps/dcm2xml.cc + dcmimgle/apps/dcod2lum.cc + dcmimgle/apps/dconvlum.cc + dcmimgle/libsrc/didispfn.cc + dcmpstat/apps/dcmmklut.cc + dcmpstat/apps/dcmpsprt.cc + dcmsr/libsrc/dsrdoc.cc + ofstd/include/dcmtk/ofstd/ofstream.h + ofstd/libsrc/ofcmdln.cc + +**** Changes from 2019.09.05 (eichelberg) + +- Removed include statements: + Removed include statements for , which are obsolete + since we have and cause warnings e.g. on Alpine Linux. + Affects: dcmnet/libsrc/dul.cc + ofstd/libsrc/ofchrenc.cc + +**** Changes from 2019.09.04 (riesmeier) + +- Fixed another issue with wrong VR for sequences: + Fixed another issue that caused a crash in xml2dcm when parsing a "sequence" + element with wrong VR. Made sure that instances of the DcmElement class are + only typecasted if they are of the correct type. + Thanks again to Sergei Gordey for the report and + to Maria Nedyak who actually did the analysis and created the samples files. + Affects: dcmdata/apps/xml2dcm.cc + +- Fixed crash when "tag" attribute is missing: + Fixed crash (e.g. segmentation fault on Linux systems) in xml2dcm when + parsing an XML file where the "tag" attribute is missing for an element. + Also enhanced log output in case the "tag" or "vr" attribute is missing. + Thanks to Sergei Gordey for the report and the + samples files (created by a fuzzing tool). + Affects: dcmdata/apps/xml2dcm.cc + +**** Changes from 2019.09.04 (eichelberg) + +- Use null pointer as sentinel for execl calls: + Since commit ac56966a4 caused warnings on a number of platforms, the + execl calls now use 0 casted to pointer to avoid "missing sentinel" + warnings on gcc 8.3. + Affects: dcmnet/apps/storescp.cc + dcmpstat/libsrc/dviface.cc + +**** Changes from 2019.08.26 (goldhammer) + +- Workaround for libxml on the IBM XL C/C++ compiler: + The libxml library might also employ the ICU library depending on its + configuration. As a result, the usual problems can be perceived on the + IBM XL C/C++ compiler that were fixed for DCMTK itself in a previous + commit. + This commit applies the same workaround wherever libxml is included. + Affects: dcmdata/apps/xml2dcm.cc + dcmsr/apps/xml2dsr.cc + dcmsr/include/dcmtk/dcmsr/dsrxmlc.h + +**** Changes from 2019.08.23 (eichelberg) + +- Use OFnullptr as sentinel parameter for execl calls: + Use OFnullptr instead of NULL as final sentinel parameter in all excel + calls to avoid gcc 8.3 warnings on platforms where NULL is not defined + as a pointer. + Affects: dcmnet/apps/storescp.cc + dcmpstat/libsrc/dviface.cc + +**** Changes from 2019.08.22 (riesmeier) + +- Fixed various HTML issues in API documentation: + Also removed trailing spaces. + Affects: oflog/include/dcmtk/oflog/layout.h + +**** Changes from 2019.08.22 (eichelberg) + +- Fixed compilation of arith.cc on Cygwin: + Fixed compilation of arith.cc (which is part of the CMake-based configure + process) when compiling on Cygwin. Unfortunately, Cygwin has the header file + but fails to implement fpgetmask/fpsetmask in its libraries. + Without these functions (and their alternatives, which are also missing), + we cannot test if the system has signaling NaN floating point numbers, + so DCMTK_DOUBLE_HAS_SIGNALING_NAN and OFnumeric_limits::has_signaling_NaN + will default to false on Cygwin. + Affects: config/tests/arith.cc + +**** Changes from 2019.08.19 (goldhammer) + +- Workaround for ICU on the IBM XL C/C++ compiler: + In some cases the ICU library tries to use the char16_t type even though + the compiler does not understand it. This workaround makes sure, that in + such cases the ICU falls back to uint16_t. Additionally there was a problem + with the definition of U_NOEXCEPT from the internal API of the ICU. This + should also be resolved. + Affects: CMake/GenerateDCMTKConfigure.cmake + config/configure + config/configure.in + config/include/dcmtk/config/osconfig.h.in + ofstd/libsrc/ofchrenc.cc + +**** Changes from 2019.08.16 (riesmeier) + +- Added support for detecting a URL in code value: + Enhanced check in DSRCodedEntryValue::determineCodeValueType() to also + detect commonly used variants of a URL. + Affects: dcmsr/include/dcmtk/dcmsr/dsrcodvl.h + dcmsr/libsrc/dsrcodvl.cc + dcmsr/tests/tsrcodvl.cc + +**** Changes from 2019.08.16 (eichelberg) + +- Use DICOM_WARNING_STATUS to check for DIMSE warnings: + Now consistently using the macro DICOM_WARNING_STATUS() to check + whether or not a DIMSE status value is a warning. The macro also + takes into account special cases where a warning status is not + in the 0xB000-0xBFFF range. + This closes DCMTK issue #894. + Affects: dcmpstat/libsrc/dvpssp.cc + dcmqrdb/libsrc/dcmqrcbg.cc + dcmqrdb/libsrc/dcmqrcbm.cc + +**** Changes from 2019.08.14 (eichelberg) + +- Added better logger output to RLE decoder. + Affects: dcmdata/libsrc/dcrleccd.cc + +**** Changes from 2019.08.13 (riesmeier) + +- Added "const" specifier to writeSequenceItem(): + The "const" specifier was apparently missing since the method does not + modify any member variables. + Affects: dcmsr/include/dcmtk/dcmsr/dsrcodvl.h + dcmsr/libsrc/dsrcodvl.cc + +**** Changes from 2019.08.12 (riesmeier) + +- Added support for new Storage SOP Classes: + Added definition of two new Storage SOP Class UIDs from Supplement 175. + This also includes support for the various networking tools and for + generating a DICOMDIR referencing objects of the underlying IODs. + Affects: dcmdata/include/dcmtk/dcmdata/dcuid.h + dcmdata/libsrc/dcddirif.cc + dcmdata/libsrc/dcuid.cc + dcmnet/docs/movescu.man + dcmnet/docs/storescp.man + dcmnet/etc/storescp.cfg + dcmnet/etc/storescu.cfg + dcmqrdb/docs/dcmqrscp.man + dcmqrdb/etc/dcmqrprf.cfg + +- Added new well-known Frame of Reference UID: + Added well-known Frame of Reference UID from Supplement 175. + Affects: dcmdata/include/dcmtk/dcmdata/dcuid.h + dcmdata/libsrc/dcuid.cc + +**** Changes from 2019.08.12 (eichelberg) + +- Cleanup of dcmtk/oflog/oflog.h dependencies: + The widely used header file dcmtk/oflog/oflog.h included several other + headers that were not really needed, thus causing unneccessary dependencies + and increased compile time. Reduced dependencies in oflog.h and added + explicit include statements where required. + Affects: dcmdata/apps/cda2dcm.cc + dcmdata/apps/mdfconen.cc + dcmdata/apps/mdfconen.h + dcmdata/apps/mdfdsman.h + dcmdata/apps/pdf2dcm.cc + dcmdata/apps/stl2dcm.cc + dcmdata/include/dcmtk/dcmdata/dcencdoc.h + dcmdata/libsrc/dcdict.cc + dcmdata/libsrc/dcencdoc.cc + dcmdata/libsrc/dcvrda.cc + dcmdata/libsrc/dcvrobow.cc + dcmdata/libsrc/dcvrod.cc + dcmdata/libsrc/dcvrof.cc + dcmdata/libsrc/dcvrol.cc + dcmdata/libsrc/dcvrov.cc + dcmdata/libsrc/dcvrpobw.cc + dcmimage/include/dcmtk/dcmimage/dcmicmph.h + dcmiod/include/dcmtk/dcmiod/iodtypes.h + dcmnet/libsrc/dulpres.cc + dcmsr/tests/mkreport.cc + dcmtls/libsrc/tlsopt.cc + oflog/include/dcmtk/oflog/oflog.h + oflog/libsrc/oflog.cc + +**** Changes from 2019.08.12 (goldhammer) + +- Fixed a minor typo in a comment. + Affects: ofstd/include/dcmtk/ofstd/ofxml.h + +**** Changes from 2019.08.10 (eichelberg) + +- Added bitstream padding command line options: + Added command line options --padding-standard and --padding-zero to dcmcjpls + that define how odd-length JPEG-LS bitstreams are padded: by writing an + extended end of image marker (FF FF D9) or by adding a zero byte (FF D9 00). + Default behaviour is to write an extended marker, as required by the standard. + Option --padding-zero can be used to create compressed images that can be + decoded by implementations (such as the HP LOCO reference implementation) that + do not support extended marker segments. + Affects: config/docs/macros.txt + dcmjpls/apps/dcmcjpls.cc + dcmjpls/docs/dcmcjpls.man + dcmjpls/include/dcmtk/dcmjpls/djcodece.h + dcmjpls/include/dcmtk/dcmjpls/djcparam.h + dcmjpls/include/dcmtk/dcmjpls/djencode.h + dcmjpls/libsrc/djcodece.cc + dcmjpls/libsrc/djcparam.cc + dcmjpls/libsrc/djencode.cc + +**** Changes from 2019.08.09 (riesmeier) + +- Added wlmsetup.txt to module page and install it: + Added recently introduced documentation file "wlmsetup.txt" to the Doxygen + module page of "dcmwlm" and install this file during "make install". + Added: dcmwlm/docs/CMakeLists.txt + Affects: dcmwlm/CMakeLists.txt + dcmwlm/docs/Makefile.in + dcmwlm/docs/dcmwlm.dox + +**** Changes from 2019.08.08 (riesmeier) + +- Fixed declaration order of member variables: + Fixed order of declaration of member variables to avoid warning messages + reported by gcc with -Wreorder (which is the default on some systems). + Also fixed typo in API documentation and rewrapped lines. + Affects: dcmjpls/include/dcmtk/dcmjpls/djcparam.h + +- Updated latest tested CMake version: + Updated information on latest CMake version that has been tested to "3.15.2". + Also replaced outdated comment on "minimum CMake version required". + Affects: CMake/dcmtkPrepare.cmake + +**** Changes from 2019.08.07 (riesmeier) + +- Updated keyword of attribute (0018,100B): + Changed keyword of attribute (0018,100B) from "ManufacturersDeviceClassUID" + to "ManufacturersDeviceClassUID" in order to comply with the official mapping + of attribute names to keywords ("'s" is removed). + This change was made after receiving feedback from David Clunie, editor of the + DICOM standard, and publlication of the "FT2" version of Supplement 175. + Affects: dcmdata/data/dicom.dic + dcmdata/include/dcmtk/dcmdata/dcdeftag.h + dcmdata/libsrc/dcdictbi.cc + +- Updated data dictionary for Supplement 175: + Updated data dictionary for recently approved changes to the DICOM standard, + i.e. Final Text of Supplement 175 (Second Generation Radiotherapy - C-Arm RT + Treatment Modalities). + Affects: dcmdata/data/dicom.dic + dcmdata/include/dcmtk/dcmdata/dcdeftag.h + dcmdata/libsrc/dcdictbi.cc + +- Added missing full stop to end of sentence. + Affects: dcmimgle/include/dcmtk/dcmimgle/dcmimage.h + +**** Changes from 2019.08.06 (eichelberg) + +- Changed DJLSCodecParameter constructor parameters: + Changed parameter list of one DJLSCodecParameter constructor to make + sure that default construction can be resolved without ambiguity. + This fixes an error on Visual Studio 2012. + Affects: dcmjpls/include/dcmtk/dcmjpls/djcparam.h + dcmjpls/libsrc/djcparam.cc + dcmjpls/libsrc/djencode.cc + +**** Changes from 2019.08.05 (eichelberg) + +- CMake option DCMTK_COMPILE_WIN32_MULTITHREADED_DLL: + Added CMake option DCMTK_COMPILE_WIN32_MULTITHREADED_DLL that controls whether + DCMTK gets compiled using the Multithreaded static (/MT) or DLL (/MD) runtime + library when using MSVC. Note that enabling BUILD_SHARED_LIBS also automatically + enables DCMTK_COMPILE_WIN32_MULTITHREADED_DLL. + This closes DCMTK issue #842. + Affects: CMake/dcmtkPrepare.cmake + +**** Changes from 2019.08.03 (eichelberg) + +- Fixed bug in the near-lossless JPEG-LS encoder: + Fixed a bug in the JPEG-LS cooked encoder affecting images with BitsStored + values other than 8 or 16 when compressed in near-lossless mode. The bug caused + the number of bits per pixel fed to the encoder to be always set to 8 or 16, + which could cause pixel values to overflow the permitted value range. + Affects: dcmjpls/libsrc/djcodece.cc + +- Avoid passing default JPEG-LS parameters to encoder: + Avoid passing JPEG-LS parameters T1, T2, T3 and RESET to the encoder + if all values are default values. This avoids unnecessary LSE segments + from being written to the JPEG-LS bitstream, which was a side effect + introduced with commit 8bacf8741. + Affects: dcmjpls/libsrc/djcodece.cc + +**** Changes from 2019.07.31 (eichelberg) + +- Fixed custom RESET value issue in JPEG-LS encoder: + The JPEG-LS standard allows encoding images with a custom RESET value in + the JPEG-LS preset coding parameters. Due to a bug in CharLS, the use of + custom RESET values caused invalid JPEG-LS bitstreams to be created when + compressing images with more than 8 bits/sample. This bug was registered + as issue #35 in the bug tracker of the CharLS project. Fixed the issue by + back-porting the related fix (commit bd8cb5c) from CharLS 1.1. + Affects: dcmjpls/libcharls/jpegls.cc + +**** Changes from 2019.07.30 (eichelberg) + +- Added --workaround-incpl option to dcmdjpls: + Added --workaround-incpl option to dcmdjpls that offers the same + functionality as in dcmdjpeg, where this option was already available. + In brief, the option allows incomplete bitstreams to be decoded + to an uncompressed (but probably incomplete) DICOM image. + Affects: dcmjpls/apps/dcmdjpls.cc + dcmjpls/docs/dcmdjpls.man + dcmjpls/include/dcmtk/dcmjpls/djcparam.h + dcmjpls/include/dcmtk/dcmjpls/djdecode.h + dcmjpls/libsrc/djcodecd.cc + dcmjpls/libsrc/djcparam.cc + dcmjpls/libsrc/djdecode.cc + +- Added text file explaining the Worklist SCP setup: + Since the original text file explaining the setup of wlmscpfs, DCMTK's + Worklist SCP, was removed in 2015 along with the unmaintained "wwwapps" + scripts, added a new text document describing the setup and file format + used by wlmscpfs. + Added: dcmwlm/docs/wlmsetup.txt + +- Enable setting of individual JPEG-LS encoding parameters: + Previously, modifying the JPEG-LS encoding parameters T1, T2, T3 and RESET + required that all parameters be set manually. Now they can be set individually + and the values of the other parameters are computed automatically if needed. + Support for the JPEG-LS parameter LIMIT, which is not accessible through a + public API in CharLS, was removed. + Affects: dcmjpls/apps/dcmcjpls.cc + dcmjpls/docs/dcmcjpls.man + dcmjpls/include/dcmtk/dcmjpls/djcodece.h + dcmjpls/include/dcmtk/dcmjpls/djcparam.h + dcmjpls/include/dcmtk/dcmjpls/djencode.h + dcmjpls/libsrc/djcodece.cc + dcmjpls/libsrc/djcparam.cc + dcmjpls/libsrc/djencode.cc + +**** Changes from 2019.07.29 (eichelberg) + +- Minor correction to previous commit. + Affects: dcmjpls/libsrc/djcodecd.cc + +**** Changes from 2019.07.28 (eichelberg) + +- Fixed bug in JPEG-LS decoder: + Fixed bug in JPEG-LS decoder: PlanarConfiguration was not updated when + decompressing a color image with one of the (non-default) options + --planar-auto, --color-by-pixel or --color-by-plane. + Affects: dcmjpls/libsrc/djcodecd.cc + +**** Changes from 2019.07.12 (riesmeier) + +- Minor fixes after previous commit: + Fixed source code formatting and some (ancient) typos. Also avoided use of + OFString::c_str() where not needed, rename file if "on the fly compression" + fails, and report successful renaming to the debug logger. + Affects: dcmnet/apps/storescu.cc + dcmnet/docs/storescu.man + +**** Changes from 2019.07.12 (onken) + +- Option to rename file after processing: + Added option to storescu to rename files after processing them by + appending .bad or .good at the end of the file name. + Thanks to Grischa Zengel for the original patch. + Affects: dcmnet/apps/storescu.cc + dcmnet/docs/storescu.man + +**** Changes from 2019.07.08 (riesmeier) + +- Fixed issue with empty OverlayActivationLayer: + Fixed possible issue with empty value for Overlay Activation Layer + (60xx,1001) in a GSPS object, which could result in a crash (OFString + initialized with a NULL pointer). However, when DCMTK was compiled with + USE_NULL_SAFE_OFSTRING defined and without STl support (i.e. in default + configuration), no crash could occur. + Thanks to Daniel Grieger for the report + and suggested fix. + Affects: dcmpstat/include/dcmtk/dcmpstat/dvpsal.h + dcmpstat/libsrc/dvpsall.cc + +**** Changes from 2019.07.05 (riesmeier) + +- Added missing prefix "DCMTK_" to CMake variable: + Added missing prefix "DCMTK_" to CMake variable DCMTK_PACKAGE_VERSION_SUFFIX. + Affects: doxygen/CMakeLists.txt + +**** Changes from 2019.07.04 (riesmeier) + +- Added wide char support to XML parser (Windows): + Added macro that enables the wide char (wchar_t*) support of the XML parser + that is part of the DCMTK (ofstd/ofxml). This support is limited to Windows + systems and still regarded as experimental (see documentation for details). + Instead of defining UNICODE/_UNICODE (which is still not supported by the + DCMTK) the macro WIDE_CHAR_XML_PARSER has been introduced for this purpose. + Affects: config/docs/macros.txt + dcmdata/libsrc/dcencdoc.cc + ofstd/include/dcmtk/ofstd/ofxml.h + +**** Changes from 2019.07.03 (riesmeier) + +- Added new print flag PF_printEmptyCodes: + Added new print flag PF_printEmptyCodes, which prints the text "empty code" + for empty codes instead of "invalid code". This new flag is e.g. used for + the output stream operator of the DSRCodedEntryValue class. + Background: Empty coded entry values are usually treated as invalid but it + might be useful to distinguish them from "really" invalid codes when being + printed (e.g. output to a stream). + Affects: dcmsr/include/dcmtk/dcmsr/dsrtypes.h + dcmsr/libsrc/dsrcodvl.cc + dcmsr/libsrc/dsrtypes.cc + +**** Changes from 2019.06.27 (riesmeier) + +- Added createXXXArray() method for OD, OF, OL, OV: + Added createXXXArray() method for "new" value representations OD, OF, OL and + OV. Also introduced a new error code (condition constant) that is used when + the element length would be larger than what the 32-bit length field permits. + Affects: dcmdata/include/dcmtk/dcmdata/dcerror.h + dcmdata/include/dcmtk/dcmdata/dcvrod.h + dcmdata/include/dcmtk/dcmdata/dcvrof.h + dcmdata/include/dcmtk/dcmdata/dcvrol.h + dcmdata/include/dcmtk/dcmdata/dcvrov.h + dcmdata/libsrc/dcerror.cc + dcmdata/libsrc/dcvrod.cc + dcmdata/libsrc/dcvrof.cc + dcmdata/libsrc/dcvrol.cc + dcmdata/libsrc/dcvrov.cc + +- Fixed minor issues in API documentation. + Affects: dcmdata/include/dcmtk/dcmdata/dcbytstr.h + dcmdata/include/dcmtk/dcmdata/dcvrat.h + dcmdata/include/dcmtk/dcmdata/dcvrfd.h + +**** Changes from 2019.06.20 (eichelberg) + +- Fixed CMake OpenSSL version check: + The CMake OpenSSL version check now also correctly works when OpenSSL + is installed in a non-standard directory pointed to by OPENSSL_ROOT_DIR. + Affects: CMake/3rdparty.cmake + +**** Changes from 2019.06.19 (riesmeier) + +- Updated code definitions for DICOM 2019c: + Updated automatically generated code definitions for coding scheme "NCIt". + For coding scheme "DCM" and "UMLS", there were no changes. + Affects: dcmsr/include/dcmtk/dcmsr/codes/ncit.h + +**** Changes from 2019.06.19 (eichelberg) + +- Fixed compilation of arith.cc on CygWin. + Affects: config/tests/arith.cc + +**** Changes from 2019.06.15 (onken) + +- Notify about association termination: + Notify about the termination of an association using the related method + in the DcmSCP class. The notify method has been called in DcmSCP but not + on the threaded version of the class (DcmThreadSCP) which has been fixed + with this commit. + Thanks to Brian Wise for the report. + Affects: dcmnet/libsrc/scpthrd.cc + +**** Changes from 2019.06.14 (riesmeier) + +- Fixed issue with loop check (by-reference): + Fixed issue with loop check for by-reference relationships. + Affects: dcmsr/include/dcmtk/dcmsr/dsrdocst.h + dcmsr/libsrc/dsrdocst.cc + dcmsr/tests/tests.cc + dcmsr/tests/tsrdoctr.cc + +**** Changes from 2019.06.13 (riesmeier) + +- Minor fixes to API documentation and formatting. + Affects: dcmdata/include/dcmtk/dcmdata/dcbytstr.h + dcmdata/include/dcmtk/dcmdata/dcdicdir.h + dcmdata/include/dcmtk/dcmdata/dcdirrec.h + dcmdata/include/dcmtk/dcmdata/dcfilefo.h + dcmdata/include/dcmtk/dcmdata/dcitem.h + dcmdata/include/dcmtk/dcmdata/dcmetinf.h + dcmdata/include/dcmtk/dcmdata/dcobject.h + dcmdata/include/dcmtk/dcmdata/dcpixel.h + dcmdata/include/dcmtk/dcmdata/dcpixseq.h + dcmdata/include/dcmtk/dcmdata/dcpxitem.h + dcmdata/include/dcmtk/dcmdata/dcsequen.h + dcmdata/include/dcmtk/dcmdata/dcvrat.h + dcmdata/include/dcmtk/dcmdata/dcvrfd.h + dcmdata/include/dcmtk/dcmdata/dcvrfl.h + dcmdata/include/dcmtk/dcmdata/dcvrobow.h + dcmdata/include/dcmtk/dcmdata/dcvrod.h + dcmdata/include/dcmtk/dcmdata/dcvrof.h + dcmdata/include/dcmtk/dcmdata/dcvrol.h + dcmdata/include/dcmtk/dcmdata/dcvrpobw.h + dcmdata/include/dcmtk/dcmdata/dcvrsl.h + dcmdata/include/dcmtk/dcmdata/dcvrss.h + dcmdata/include/dcmtk/dcmdata/dcvrui.h + dcmdata/include/dcmtk/dcmdata/dcvrul.h + dcmdata/include/dcmtk/dcmdata/dcvrulup.h + dcmdata/include/dcmtk/dcmdata/dcvrur.h + dcmdata/include/dcmtk/dcmdata/dcvrus.h + dcmdata/include/dcmtk/dcmdata/dcvrut.h + dcmdata/libsrc/dcdatset.cc + dcmdata/libsrc/dcdicdir.cc + dcmdata/libsrc/dcdirrec.cc + dcmdata/libsrc/dcmetinf.cc + dcmdata/libsrc/dcobject.cc + dcmdata/libsrc/dcpixel.cc + dcmdata/libsrc/dcpxitem.cc + dcmdata/libsrc/dcsequen.cc + dcmdata/libsrc/dcvrfd.cc + dcmdata/libsrc/dcvrfl.cc + dcmdata/libsrc/dcvrobow.cc + dcmdata/libsrc/dcvrsl.cc + dcmdata/libsrc/dcvrss.cc + dcmdata/libsrc/dcvrul.cc + dcmdata/libsrc/dcvrus.cc + +- Added full support for new 64-bit VRs: + Added full support for the three new 64-bit integer VRs introduced with + CP-1819: Other 64-bit Very Long (OV), Signed 64-bit Very Long (SV) and + Unsigned 64-bit Very Long (UV). + Currently, the DICOM standard only uses "OV" for two DICOM attributes + introduced with CP-1818 (Extended Offset Table). + This closes DCMTK Conformance #867. + Added: dcmdata/include/dcmtk/dcmdata/dcvrov.h + dcmdata/include/dcmtk/dcmdata/dcvrsv.h + dcmdata/include/dcmtk/dcmdata/dcvruv.h + dcmdata/libsrc/dcvrov.cc + dcmdata/libsrc/dcvrsv.cc + dcmdata/libsrc/dcvruv.cc + dcmdata/tests/tvrov.cc + dcmdata/tests/tvrsv.cc + dcmdata/tests/tvruv.cc + Affects: dcmdata/apps/Makefile.dep + dcmdata/docs/dcm2xml.man + dcmdata/docs/xml2dcm.man + dcmdata/include/dcmtk/dcmdata/dcelem.h + dcmdata/include/dcmtk/dcmdata/dcitem.h + dcmdata/include/dcmtk/dcmdata/dctk.h + dcmdata/libi2d/Makefile.dep + dcmdata/libsrc/CMakeLists.txt + dcmdata/libsrc/Makefile.dep + dcmdata/libsrc/Makefile.in + dcmdata/libsrc/dcelem.cc + dcmdata/libsrc/dcitem.cc + dcmdata/tests/CMakeLists.txt + dcmdata/tests/Makefile.dep + dcmdata/tests/Makefile.in + dcmdata/tests/telemlen.cc + dcmdata/tests/tests.cc + dcmfg/libsrc/Makefile.dep + dcmfg/tests/Makefile.dep + dcmimage/apps/Makefile.dep + dcmimage/libsrc/Makefile.dep + dcmimgle/apps/Makefile.dep + dcmimgle/libsrc/Makefile.dep + dcmiod/libsrc/Makefile.dep + dcmiod/tests/Makefile.dep + dcmjpeg/apps/Makefile.dep + dcmjpeg/libsrc/Makefile.dep + dcmjpls/apps/Makefile.dep + dcmjpls/libcharls/Makefile.dep + dcmnet/apps/Makefile.dep + dcmnet/libsrc/Makefile.dep + dcmnet/tests/Makefile.dep + dcmpmap/libsrc/Makefile.dep + dcmpstat/apps/Makefile.dep + dcmpstat/libsrc/Makefile.dep + dcmpstat/tests/Makefile.dep + dcmqrdb/libsrc/Makefile.dep + dcmrt/apps/Makefile.dep + dcmrt/libsrc/Makefile.dep + dcmrt/tests/Makefile.dep + dcmseg/libsrc/Makefile.dep + dcmseg/tests/Makefile.dep + dcmsign/apps/Makefile.dep + dcmsr/apps/Makefile.dep + dcmsr/libcmr/Makefile.dep + dcmsr/tests/Makefile.dep + dcmtls/libsrc/Makefile.dep + dcmtract/libsrc/Makefile.dep + dcmwlm/libsrc/Makefile.dep + oflog/libsrc/Makefile.dep + ofstd/libsrc/Makefile.dep + +**** Changes from 2019.06.12 (eichelberg) + +- Added compiler flags to suppress some xlC warnings. + Affects: CMake/dcmtkPrepare.cmake + +- Fixed IBM xlC warnings in libxml headers. + Affects: dcmdata/apps/xml2dcm.cc + dcmsr/apps/xml2dsr.cc + dcmsr/include/dcmtk/dcmsr/dsrxmlc.h + +**** Changes from 2019.05.22 (onken) + +- Enhanced img2dcm documentation (no multi-frame): + Added hint to documentation that img2dcm only creates single-frame + objects so far, even if some of the available output IODs potentially + allow multi-frame. + Affects: dcmdata/docs/img2dcm.man + +**** Changes from 2019.05.14 (eichelberg) + +- Do not use the ios::nocreate flag in C++11 mode. + Affects: dcmdata/apps/dcm2xml.cc + dcmimgle/apps/dcod2lum.cc + dcmimgle/apps/dconvlum.cc + dcmimgle/libsrc/didispfn.cc + dcmpstat/apps/dcmmklut.cc + dcmpstat/apps/dcmpsprt.cc + dcmsr/libsrc/dsrdoc.cc + ofstd/libsrc/ofcmdln.cc + +**** Changes from 2019.05.10 (eichelberg) + +- Fixed tabs and space characters. + Affects: ofstd/include/dcmtk/ofstd/ofbmanip.h + +- Fixed previous commit: + Fixed the previous commit which in certain constellations could + lead to a duplicate move of a memory buffer. + Affects: ofstd/include/dcmtk/ofstd/ofbmanip.h + +**** Changes from 2019.05.09 (riesmeier) + +- Only use PTRDIFF_MAX if defined: + There seem to be systems where the macro constant PTRDIFF_MAX is not defined + even though it should be (is part of C99, defined in header file "stdint.h"). + Affects: ofstd/include/dcmtk/ofstd/ofbmanip.h + +**** Changes from 2019.05.09 (eichelberg) + +- Define Uint32 as uint32_t if possible: + Now covering additional cases: define Uint32 as uint32_t if possible, + to avoid warnings when C99 printf macros like PRIu32 are used to print a + 32-bit integer. + Affects: ofstd/include/dcmtk/ofstd/oftypes.h + +- Fixed warning in OFBitmanipTemplate::moveMem(): + On some platforms (such as MinGW), memmove cannot move buffers larger + than PTRDIFF_MAX. In this case, fall back to our own implementation of + OFBitmanipTemplate::moveMem(). + Affects: ofstd/include/dcmtk/ofstd/ofbmanip.h + +**** Changes from 2019.05.09 (onken) + +- Added missing file for commit f2fd2d. + Added: dcmfg/tests/t_frame_content.cc + +- Minor formatting fixes. + Affects: dcmfg/tests/t_deriv_image.cc + +- Added test for Frame Content Functional Group. + Affects: dcmfg/tests/CMakeLists.txt + dcmfg/tests/Makefile.dep + dcmfg/tests/Makefile.in + dcmfg/tests/tests.cc + +**** Changes from 2019.05.09 (schlamelcher) + +- Fixed OFin_place again: + Turns out an old GCC (4.4.7) is similarly retarded as a recent Visual Studio. + This fix should finally work on all compilers (hopefully). All this to get + rid of a warning on clang that was inappropriate in the first place -.-. + Affects: ofstd/libsrc/ofstd.cc + +**** Changes from 2019.05.07 (schlamelcher) + +- As expected, MSVC gets the #ifdef it deserves. + Affects: ofstd/libsrc/ofstd.cc + +**** Changes from 2019.05.07 (riesmeier) + +- Fixed minor formatting issues. + Affects: dcmpstat/etc/dcmpstat.cfg + dcmtls/libsrc/tlsopt.cc + +- Removed old STATUS_STORE_xxx constant: + Removed old STATUS_STORE_xxx constant, which has been replaced about 6 years + ago. Instead of STATUS_STORE_Warning_CoersionOfDataElements the correctly + spelled constant STATUS_STORE_Warning_CoercionOfDataElements should be used. + Affects: dcmnet/include/dcmtk/dcmnet/dimse.h + +- Fixed typo in log message. + Affects: dcmdata/libsrc/dcmetinf.cc + +- Separate DIMSE status strings for C-MOVE and C-GET: + Split print DIMSE status string function for C-MOVE and C-GET since some + status codes are only used for one of the two DIMSE messages. + Affects: dcmnet/libsrc/dimdump.cc + +- Fixed wrong DIMSE status codes (A8xx/A800): + Fixed wrong DIMSE status codes A8xx (for C-STORE and C-FIND) and A800 (for + C-GET and C-MOVE), which were never defined in the official DICOM standard. + Now, the DCMTK uses the correct DIMSE status code 0122H for "SOP Class not + supported" for all DIMSE messages. This bug was contained in the DCMTK since + 1993, i.e. already in its first release. + Currently, the DICOM standard is not consistent regarding the error class + (refused, failed or error) for this and other status codes, so in the future + there might be name changes of the corresponding constants/defines. + Affects: dcmnet/include/dcmtk/dcmnet/dimse.h + dcmnet/libsrc/dimdump.cc + dcmnet/libsrc/diutil.cc + dcmnet/libsrc/dstorscu.cc + +**** Changes from 2019.05.06 (eichelberg) + +- Implemented Extended BCP 195 TLS Profile: + Implemented support for the Extended BCP 195 TLS Profile in the + dcmtls module and the various TLS enabled DCMTK tools. + This closes DCMTK Feature #838. + Affects: dcmnet/docs/echoscu.man + dcmnet/docs/findscu.man + dcmnet/docs/storescp.man + dcmnet/docs/storescu.man + dcmpstat/apps/dcmprscp.cc + dcmpstat/apps/dcmprscu.cc + dcmpstat/apps/dcmpsrcv.cc + dcmpstat/apps/dcmpssnd.cc + dcmpstat/etc/dcmpstat.cfg + dcmpstat/libsrc/dviface.cc + dcmtls/docs/ciphers.txt + dcmtls/include/dcmtk/dcmtls/tlsciphr.h + dcmtls/include/dcmtk/dcmtls/tlslayer.h + dcmtls/include/dcmtk/dcmtls/tlsscu.h + dcmtls/libsrc/tlsciphr.cc + dcmtls/libsrc/tlslayer.cc + dcmtls/libsrc/tlsopt.cc + dcmtls/libsrc/tlsscu.cc + +- Implemented Extended BCP 195 TLS Profile: + Implemented support for the Extended BCP 195 TLS Profile in the + dcmtls module and the various TLS enabled DCMTK tools. + This closes DCMTK Feature #838. + Removed: dcmtls/tests/dcmtls_testsuite_generate.pl + dcmtls/tests/dcmtls_testsuite_run.pl + +**** Changes from 2019.05.06 (schlamelcher) + +- Hopefully fixed rare issues regarding : + In some edge cases "ofutil.h" used stuff from without actually + including that header. It is now always included since all compilers we still + support seem to provide it. + Affects: ofstd/include/dcmtk/ofstd/ofutil.h + +- Workaround to silence some clang warnings: + If this breaks Visual Studio, I will #ifdef things. + Affects: ofstd/libsrc/ofstd.cc + +**** Changes from 2019.05.05 (eichelberg) + +- Fixed warning on Win64 about socket type conversion: + On Win64, the native type for sockets there is an unsigned 64-bit + integer, and OpenSSL uses a signed 32-bit int file descriptor. This has + to be fixed in OpenSSL. We now check whether the type conversion + truncates the value and, in this case, issue an error message. + Affects: dcmtls/libsrc/tlslayer.cc + +- Fixed type conversion warning. + Affects: dcmiod/libsrc/iodmacro.cc + +- Replaced strncpy with strlcpy. + Affects: dcmdata/libsrc/dcdict.cc + +**** Changes from 2019.05.03 (riesmeier) + +- Fixed issue with .cc file listed for "make clean". + Affects: dcmfg/tests/Makefile.in + +**** Changes from 2019.05.03 (onken) + +- Add new dcmfg test to autoconf build. + Affects: dcmfg/Makefile.in + dcmfg/tests/Makefile.dep + dcmfg/tests/Makefile.in + +- Clean up after test. + Affects: dcmfg/tests/t_deriv_image.cc + +- Added first test for dcmfg module: + Added first test for dcmfg module, testing the Derivation Image + Functional Group class. + Added: dcmfg/tests/CMakeLists.txt + dcmfg/tests/Makefile.dep + dcmfg/tests/t_deriv_image.cc + dcmfg/tests/tests.cc + Affects: dcmfg/CMakeLists.txt + +- Fixed access to Referenced Frame Number: + Fixed access to Referenced Frame Number requiring explicit conversion + of Uint16 values and the target VR Integer String. + Affects: dcmiod/libsrc/iodmacro.cc + +- Permit skipping of functional group checks. + Affects: dcmfg/include/dcmtk/dcmfg/fginterface.h + dcmfg/libsrc/fginterface.cc + dcmseg/include/dcmtk/dcmseg/segdoc.h + dcmseg/libsrc/segdoc.cc + +- Check for multiplication overflow. + Affects: dcmdata/libsrc/dcvrobow.cc + +**** Changes from 2019.05.03 (eichelberg) + +- Define Uint32 as uint32_t if possible: + Define Uint32 as uint32_t if possible, to avoid warnings when C99 + printf macros like PRIu32 are used to print a 32-bit integer. + Affects: ofstd/include/dcmtk/ofstd/oftypes.h + +**** Changes from 2019.04.26 (riesmeier) + +- Updated SR Template classes for DICOM 2019b: + Updated SR Template classes from DCMR for the 2019b edition of the DICOM + standard, i.e. all SRT (SNOMED RT) codes were replaced by their associated + SCT (SNOMED CT) counterparts. This change was introduced with CP-1850. + Affects: dcmsr/libcmr/Makefile.dep + dcmsr/libcmr/tid1411.cc + dcmsr/libcmr/tid1419m.cc + dcmsr/libcmr/tid1501.cc + dcmsr/libcmr/tid1600.cc + dcmsr/libcmr/tid300.cc + +- Updated Context Group classes for DICOM 2019b: + Updated automatically generated Context Group classes for the 2019b edition + of the DICOM standard. All supported classes were updated, even though there + were not changes to all of them. + Please note that all SRT (SNOMED RT) codes were replaced by their associated + SCT (SNOMED CT) counterparts. This change was introduced with CP-1850. + Affects: dcmsr/include/dcmtk/dcmsr/cmr/cid100.h + dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h + dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h + dcmsr/include/dcmtk/dcmsr/cmr/cid11.h + dcmsr/include/dcmtk/dcmsr/cmr/cid244.h + dcmsr/include/dcmtk/dcmsr/cmr/cid29.h + dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h + dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h + dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h + dcmsr/include/dcmtk/dcmsr/cmr/cid42.h + dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h + dcmsr/libcmr/cid100.cc + dcmsr/libcmr/cid10013.cc + dcmsr/libcmr/cid10033.cc + dcmsr/libcmr/cid11.cc + dcmsr/libcmr/cid244.cc + dcmsr/libcmr/cid29.cc + dcmsr/libcmr/cid4020.cc + dcmsr/libcmr/cid4021.cc + dcmsr/libcmr/cid4031.cc + dcmsr/libcmr/cid42.cc + dcmsr/libcmr/cid6147.cc + dcmsr/libcmr/cid7021.cc + dcmsr/libcmr/cid7181.cc + dcmsr/libcmr/cid7445.cc + dcmsr/libcmr/cid7452.cc + dcmsr/libcmr/cid7453.cc + dcmsr/libcmr/cid7464.cc + dcmsr/libcmr/cid7469.cc + dcmsr/tests/Makefile.dep + dcmsr/tests/tsrcmr.cc + +- Updated code definitions for DICOM 2019b: + Updated automatically generated code definitions for coding scheme "DCM", + "NCIt" and "UMLS". + Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h + dcmsr/include/dcmtk/dcmsr/codes/ncit.h + dcmsr/include/dcmtk/dcmsr/codes/umls.h + +- Updated data dictionary for DICOM 2019b: + Updated data dictionary for the latest edition of the DICOM standard, which + has been released only recently (2019-04-25). + Affects: dcmdata/data/dicom.dic + dcmdata/include/dcmtk/dcmdata/dcdeftag.h + dcmdata/libsrc/dcdictbi.cc + +- Fixed API documentation of recently added method. + Affects: ofstd/include/dcmtk/ofstd/ofcmdln.h + +- Fixed outdated "purpose" text in file header. + Affects: ofstd/libsrc/ofcmdln.cc + +**** Changes from 2019.04.26 (arizpegomez) + +- Included addGeneralOptions in ofstd: + Bundled all exclusive options (help and version) into a method in ofcmdln. + Affects: ofstd/include/dcmtk/ofstd/ofcmdln.h + ofstd/libsrc/ofcmdln.cc + +**** Changes from 2019.04.24 (onken) + +- Use 16 bit for Bits Alloc. for 12 bit JPEG input: + Use 16 bit for Bits Allocated and Bits Stored if 12 bit JPEG input data + is being read since not all output formats allow 12 bit for these tags. + Fixes issue #878. + Affects: dcmdata/libi2d/i2djpgs.cc + +**** Changes from 2019.04.23 (onken) + +- Fixed minor inconsistencies: + Removed superfluous method declaration and aligned error message with + the rest of the module. + Affects: dcmwlm/apps/wlcefs.cc + dcmwlm/include/dcmtk/dcmwlm/wldsfs.h + +**** Changes from 2019.04.21 (eichelberg) + +- Fixed --accept-acr-nema option in dcmcjpeg: + Fixed the option that accepts ACR-NEMA images without photometric + interpretation in the lossy/pseudo-lossless JPEG encoder. + Affects: dcmjpeg/libsrc/djcodece.cc + dcmjpeg/libsrc/djutils.cc + +**** Changes from 2019.04.15 (eichelberg) + +- Improved lossless predictor overflow workaround: + Commit #e20dbf80e (2006) added a workaround for a known bug in older + versions of the DicomObjects toolkit where some predictor modes + (selection values) of the lossless JPEG encoder could lead to a 16-bit + overflow when compressing 16-bit images. Apparently the problem did not + only affect predictor 6, as verified with sample images provided by the + author of DicomObjects. The workaround (+w6 option in dcmdjpeg) is now + active for all affected predictors, i.e. selection values 4-7. + Affects: dcmjpeg/libijg16/jdpred.c + dcmjpeg/libijg16/jlossls16.h + +**** Changes from 2019.04.13 (onken) + +- Make option --request-file-path optional. + Affects: dcmwlm/libsrc/wlmactmg.cc + +**** Changes from 2019.04.12 (onken) + +- Fixed wlmscpfs bug rejecting all Called AE Titles: + Fixed a bug that made wlmscpfs reject all Called AE Titles, introduced + in commit 459a638e4dab967b065811a9cf63af0604ec46f1. + Thanks to Stefano Magni for the report. + Affects: dcmwlm/include/dcmtk/dcmwlm/wlds.h + dcmwlm/include/dcmtk/dcmwlm/wldsfs.h + dcmwlm/libsrc/wlds.cc + dcmwlm/libsrc/wldsfs.cc + dcmwlm/libsrc/wlmactmg.cc + +**** Changes from 2019.04.11 (riesmeier) + +- Added initial support for "SCT" code definitions: + With CP-1850 the use of the SRT coding scheme has been deprecated. As a first + step towards the migration of "SRT" to "SCT" (SNOMED CT) codes, the subset of + codes that are defined for the SRT coding scheme is now also available for + the SCT coding scheme (new header file "dcmsr/codes/sct.h"). + These new code constants are not yet used within the DCMTK. There will be + another commit replacing the use of the old CODE_SRT_xxx constants by the + respective CODE_SCT_xxx constants. Also the context group and SR template + classes will be updated later on. + Added: dcmsr/include/dcmtk/dcmsr/codes/sct.h + Affects: dcmsr/include/dcmtk/dcmsr/codes/srt.h + dcmsr/include/dcmtk/dcmsr/codes/ucum.h + +**** Changes from 2019.03.29 (eichelberg) + +- Fix dcm2pdf pad byte removal code: + Prevent dcm2pdf from stripping the last character of the %%EOF mark at the + end of the PDF file if that mark is not followed by a CR or LF character. + This closes DCMTK issue #856. + Affects: dcmdata/apps/dcm2pdf.cc + +**** Changes from 2019.03.29 (riesmeier) + +- Fixed issue with OFStringUtil::replace_all(): + Fixed issue when using OFStringUtil::replace_all() with an empty "pattern" + parameter, which should have no effect according to the corresponding test + cases. However, when STL support was enabled these test cases actually + failed since the behvior of the OFString::find() method is apparently + different. Now, it is checked whether the "pattern" parameter is empty. + Affects: ofstd/libsrc/ofstrutl.cc + +- Fixed incompatible types in assignment: + Correctly initialize char arrays in constructor in order to avoid compilation + errors with some compilers (e.g. gcc 4.8.5). + Affects: dcmwlm/libsrc/wlmactmg.cc + +- Minor fixes to recently added documentation. + Affects: dcmwlm/docs/wlmscpfs.man + +- Minor fixes to source code formatting. + Affects: dcmwlm/apps/wlcefs.cc + +**** Changes from 2019.03.29 (onken) + +- Fixed typo. + Affects: dcmwlm/apps/wlcefs.cc + +- New class OFStringUtil to stay STL-compatible: + Added new class OFStringUtil that contains the recently added + OFString replace_all methods. Since the OFString API must stay + STL-compatible, the methods have been moved from OFString to the new + class. + Added: ofstd/include/dcmtk/ofstd/ofstrutl.h + ofstd/libsrc/ofstrutl.cc + ofstd/tests/tstrutl.cc + Affects: dcmdata/apps/Makefile.dep + dcmdata/libsrc/Makefile.dep + dcmwlm/libsrc/Makefile.dep + dcmwlm/libsrc/wlmactmg.cc + ofstd/include/dcmtk/ofstd/ofstring.h + ofstd/libsrc/CMakeLists.txt + ofstd/libsrc/Makefile.dep + ofstd/libsrc/Makefile.in + ofstd/libsrc/ofstring.cc + ofstd/tests/CMakeLists.txt + ofstd/tests/Makefile.dep + ofstd/tests/Makefile.in + ofstd/tests/tests.cc + ofstd/tests/tstring.cc + +**** Changes from 2019.03.28 (onken) + +- New wlmscpfs options (dumping requests, sleeping): + Added new options --request-file-path and --request-file-format to + wlmscpfs in order to allow dumping incoming C-FIND requests to text + files using a configurable directory and file name. + Added option --sleep-before that tells wlmscpfs to wait a given number + of seconds before evaluating an incoming C-FIND response. + All options together allows users to "interactively" fill the worklist + database for an incoming request. + Acknowledgement: Thanks to Viximed for sponsoring this feature. + Affects: dcmwlm/apps/wlcefs.cc + dcmwlm/apps/wlcefs.h + dcmwlm/docs/wlmscpfs.man + dcmwlm/include/dcmtk/dcmwlm/wlds.h + dcmwlm/include/dcmtk/dcmwlm/wldsfs.h + dcmwlm/include/dcmtk/dcmwlm/wlmactmg.h + dcmwlm/libsrc/wlds.cc + dcmwlm/libsrc/wldsfs.cc + dcmwlm/libsrc/wlmactmg.cc + +- Added replace_all() methods: + Added static methods that allow to replace all occurrences of a + specified pattern with a user-defined replacement string. Added related + tests as well. + Affects: ofstd/include/dcmtk/ofstd/ofstring.h + ofstd/libsrc/ofstring.cc + ofstd/tests/tests.cc + ofstd/tests/tstring.cc + +**** Changes from 2019.03.28 (eichelberg) + +- Improved documentation: + Moved some documentation from implementation file to header file + and added comments explaining the ownership for the statusDetail parameter. + Affects: dcmnet/include/dcmtk/dcmnet/dimse.h + dcmnet/libsrc/dimse.cc + +**** Changes from 2019.03.27 (riesmeier) + +- Replaced tabs by spaces and fixed typos. + Affects: dcmnet/libsrc/dimstore.cc + +**** Changes from 2019.03.15 (riesmeier) + +- Fixed issue with verify() method for certain VRs: + Fixed issue with verify() method always splitting an element value on the + backslash character "\" even though the backslash is not a delimiter for + various VRs such as "Short Text" (ST). + Thanks to Victor Derks for the report. + Affects: dcmdata/libsrc/dcbytstr.cc + dcmdata/libsrc/dcchrstr.cc + +**** Changes from 2019.03.11 (riesmeier) + +- Always respect option --ignore-missing-tags: + Made sure that option --ignore-missing-tags is always respected. Previously, + it was not not used in combination with option --modify-all. + Thanks to Brian Lucas for the report and suggested + fix. + Affects: dcmdata/apps/mdfconen.cc + +**** Changes from 2019.03.11 (eichelberg) + +- Removed duplicate text. + Affects: docs/ANNOUNCE.364 + +- Added module constant. + Affects: dcmdata/include/dcmtk/dcmdata/dcerror.h + +**** Changes from 2019.03.08 (riesmeier) + +- Added Markdown version of README file: + Added a Markdown version of the README file, which is e.g. used by GitHub. + Also slightly extended the plain text version of the README file in order + to be consistent with the Markdown version. + Added: README.md + Affects: README + +**** Changes from 2019.03.04 (eichelberg) + +- Disable TLS 1.3 for the historic security profiles: + When compiling with OpenSSL 1.1.1 or newer, support for the TLS 1.3 protocol + is available. TLS 1.3 uses a completely different set of ciphersuites and + a different set of APIs in OpenSSL. When one of the historic TLS security + profiles (3DES, AES, and NULL) is selected, we set the maximum permitted TLS + protocol version to 1.2, because otherwise the TLS 1.3 support would lead + to unexpected behaviour (e.g. encrypted transmission despite the NULL profile + being active). + This closes DCMTK issue #865. + Affects: INSTALL + dcmtls/include/dcmtk/dcmtls/tlsciphr.h + dcmtls/libsrc/tlsciphr.cc + dcmtls/libsrc/tlslayer.cc + +**** Changes from 2019.02.22 (riesmeier) + +- Removed double class specifier DSRTypes::DSRTypes. + Affects: dcmsr/libsrc/dsrcodvl.cc + +**** Changes from 2019.02.21 (riesmeier) + +- Fixed wrong type of coding scheme designator: + Fixed wrong type of attribute Coding Scheme Designator: with CP-1031 the type + was changed from 1 (mandatory) to 1C (conditional), i.e. the Coding Scheme + Designator is not required if the code value is encoded with the URN Code + Value attribute (but maybe present). + This closes DCMTK Conformance #871. + Affects: dcmsr/include/dcmtk/dcmsr/dsrcodvl.h + dcmsr/libsrc/dsrcodvl.cc + dcmsr/tests/tsrcodvl.cc + +**** Changes from 2019.02.18 (riesmeier) + +- Enhanced documentation of setEncodingHandler(). + Affects: dcmsr/include/dcmtk/dcmsr/dsrxmld.h + +- Added missing attributes to checkMetaHeaderValue: + Added missing attributes to DcmFileFormat::checkMetaHeaderValue(), i.e. + SendingApplicationEntityTitle and ReceivingApplicationEntityTitle are now + treated in the same manner as SourceApplicationEntityTitle. Please note, + however, that this method is currently never called for these attributes. + Also changed the log level of some error and warning messages. + Affects: dcmdata/libsrc/dcfilefo.cc + +**** Changes from 2019.02.14 (riesmeier) + +- Fixed incorrect sprintf() format pattern: + For a Uint32 variable, PRIu32, "%u" or "%lu" should be used (and not + PRId32, "%d" or "%ld"). + Affects: dcmimgle/libsrc/dimoimg.cc + +**** Changes from 2019.02.13 (riesmeier) + +- Fixed typos and replaced tabs by spaces. + Affects: dcmwlm/apps/wlcefs.h + dcmwlm/include/dcmtk/dcmwlm/wlmactmg.h + +**** Changes from 2019.02.08 (riesmeier) + +- Handle new VRs SV/UV/OV separately: + Handle new VRs SV/UV/OV separately in method newDicomElement() since + "undefined length" is only defined for OV. The same is true for some + other value representations (see DCMTK Conformance #869). + Affects: dcmdata/libsrc/dcitem.cc + +- Added DCMVR_PROP_UNDEFINEDLENGTH to EVR_UNKNOWN: + Added new property DCMVR_PROP_UNDEFINEDLENGTH also to EVR_UNKNOWN, which is + used for new (unknown, not yet supported) value representations, because new + VRs always have a 32-bit value length field according to the DICOM standard + and can, therefore, potentially use "undefined length". + Affects: dcmdata/libsrc/dcvr.cc + +**** Changes from 2019.02.07 (riesmeier) + +- Added check on VR support for undefined length: + Added method that checks whether a VR supports Undefined Length for the + Value Length Field. This method might be used later on in the DICOM parser + to determine whether a Sequence Delimitation Item would be expected to mark + the end of the Value Field. + See also DCMTK Conformance #869. + Affects: dcmdata/include/dcmtk/dcmdata/dcvr.h + dcmdata/libsrc/dcvr.cc + +- Added new SR SOP Classes also to documentation: + Added new SR SOP Classes from Supplement 164, which are already supported + by DCMTK's SR implementation, also to the manpage of the commandline tools. + Affects: dcmsr/docs/dsr2html.man + dcmsr/docs/dsr2xml.man + dcmsr/docs/dsrdump.man + dcmsr/docs/xml2dsr.man + +- Fixed incorrect man and HTML page title: + Thanks to Martin Wenger for the report. + Affects: dcmsr/docs/xml2dsr.man + +- Added minimal support for new 64-bit VRs: + Added minimal support for the three new 64-bit integer VRs introduced with + CP-1819: Other 64-bit Very Long (OV), Signed 64-bit Very Long (SV) and + Unsigned 64-bit Very Long (UV). With this commit, the new VRs are no longer + regarded as unknown but a warning message explaining the issue is reported + to the logger. However, when reading a dataset, the three new VRs are still + treated as "UN". + The new VR "OV" is e.g. used for the Extended Offset Table introduced with + CP-1818 (which has also been incorporated into DICOM 2019a). + This is a first step towards closing DCMTK Conformance #867. + Affects: dcmdata/data/dicom.dic + dcmdata/include/dcmtk/dcmdata/dcdeftag.h + dcmdata/include/dcmtk/dcmdata/dcvr.h + dcmdata/libsrc/dcdictbi.cc + dcmdata/libsrc/dcitem.cc + dcmdata/libsrc/dcvr.cc + +- Replaced undefined length by explicit value: + Replaced "undefined length" constant for maximum length of value + representations OB, OW, OL, SQ and others by an explicit length value + (in bytes). Whether undefined length is allowed (or not) for a particular + VR should be specified by a separate mechanism. + Affects: dcmdata/libsrc/dcvr.cc + +**** Changes from 2019.02.04 (riesmeier) + +- Added support for Issuer of Patient ID to "dcmsr": + Added support for optional attribute Issuer of Patient ID to DCMTK's + Structured Reporting (SR) implementation. + Thanks to Hans Meine for the request. + Affects: dcmsr/data/dsr2xml.xsd + dcmsr/include/dcmtk/dcmsr/dsrdoc.h + dcmsr/libsrc/dsrdoc.cc + +- Updated copyright date. + Affects: COPYRIGHT + +- Updated Context Group classes for DICOM 2019a: + Updated automatically generated Context Group classes for the 2019a edition + of the DICOM standard. All supported classes were updated, even though there + were only changes to some of them. + Please note that some constants/enums changed their names, e.g. "RightAndLeft" + from CID244_Laterality is now called "Bilateral". + Affects: dcmsr/include/dcmtk/dcmsr/cmr/cid100.h + dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h + dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h + dcmsr/include/dcmtk/dcmsr/cmr/cid11.h + dcmsr/include/dcmtk/dcmsr/cmr/cid244.h + dcmsr/include/dcmtk/dcmsr/cmr/cid29.h + dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h + dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h + dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h + dcmsr/include/dcmtk/dcmsr/cmr/cid42.h + dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h + dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h + dcmsr/libcmr/cid100.cc + dcmsr/libcmr/cid10013.cc + dcmsr/libcmr/cid10033.cc + dcmsr/libcmr/cid11.cc + dcmsr/libcmr/cid244.cc + dcmsr/libcmr/cid244e.cc + dcmsr/libcmr/cid29.cc + dcmsr/libcmr/cid4020.cc + dcmsr/libcmr/cid4021.cc + dcmsr/libcmr/cid4031.cc + dcmsr/libcmr/cid42.cc + dcmsr/libcmr/cid6147.cc + dcmsr/libcmr/cid7021.cc + dcmsr/libcmr/cid7181.cc + dcmsr/libcmr/cid7445.cc + dcmsr/libcmr/cid7452.cc + dcmsr/libcmr/cid7453.cc + dcmsr/libcmr/cid7464.cc + dcmsr/libcmr/cid7469.cc + dcmsr/tests/tsrcmr.cc + +- Updated code definitions for DICOM 2019a: + Updated automatically generated code definitions for coding scheme "DCM", + "NCIt" and "UMLS". + Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h + dcmsr/include/dcmtk/dcmsr/codes/ncit.h + dcmsr/include/dcmtk/dcmsr/codes/umls.h + +- Updated data dictionary for DICOM 2019a: + Updated data dictionary for the latest edition of the DICOM standard, which + has been released only recently (2019-02-01). + Please note that the two new attributes ExtendedOffsetTable (7FE0,0001) and + ExtendedOffsetTableLengths (7FE0,0002) are currently commented out, i.e. not + part of the data dictionary, since their associated new value representation + "OV" (Other 64-bit Very Long) is not yet supported by the DCMTK. Also see + DCMTK Conformance #867. + Affects: dcmdata/data/dicom.dic + dcmdata/include/dcmtk/dcmdata/dcdeftag.h + dcmdata/libsrc/dcdictbi.cc + +**** Changes from 2019.02.03 (eichelberg) + +- Fixed compilation error on 32-bit Windows: + Fixed compilation error in oflog module on 32-bit Windows. + Affects: oflog/include/dcmtk/oflog/thread/impl/tls.h + oflog/libsrc/globinit.cc + +**** Changes from 2019.02.02 (riesmeier) + +- Avoid unused function warning reported by gcc. + Affects: oflog/libsrc/globinit.cc + +- Partly removed workaround for SunPro compiler. + Affects: ofstd/libsrc/ofxml.cc + +**** Changes from 2019.02.01 (riesmeier) + +- Fixed text formatting such as line indentation. + Affects: config/docs/macros.txt + +**** Changes from 2019.02.01 (eichelberg) + +- Fixed memory leak in multithreaded apps on Win32: + Fixed a memory leak occuring in multi-threaded applications on Windows + when logging output was performed in multiple threads and the user did + not manually call dcmtk::log4cplus::threadCleanup() when terminating a + thread in order to clean up the thread-local storage allocated by oflog. + Instead of thread local storage, oflog now uses fiber local storage and + registers a callback function that automatically cleans up the memory + when a thread ends, in a similar manner to the Posix pthreads code, + which never required the used to manually call a cleanup function. The + previous behaviour can be reactivated by defining the macro + DCMTK_LOG4CPLUS_AVOID_WIN32_FLS. + Thanks to Chinna Durai for the bug report + and sample code to demonstrate the problem. + Affects: config/docs/macros.txt + oflog/include/dcmtk/oflog/thread/impl/tls.h + oflog/libsrc/globinit.cc + +**** Changes from 2019.02.01 (riesmeier) + +- Added configure test for atoll() function: + Added configure test for the atoll() function that is used by "ofxml". + Also added workaround for SunPro compiler (probably) not defining this + C function in the global namespace. + Affects: CMake/GenerateDCMTKConfigure.cmake + config/configure + config/configure.in + config/include/dcmtk/config/osconfig.h.in + ofstd/include/dcmtk/ofstd/ofxml.h + ofstd/libsrc/ofxml.cc + +**** Changes from 2019.01.31 (riesmeier) + +- Updated internal XML parser to version 2.44: + Updated internal XML parser to the most recent version 2.44. + Also enabled the various "xmlto?" helper functions. + This closes DCMTK Feature #849. + Affects: ofstd/include/dcmtk/ofstd/ofxml.h + ofstd/libsrc/ofxml.cc + +**** Changes from 2019.01.30 (riesmeier) + +- Fixed warnings reported by VisualStudio: + Added explicit typecasts or revised code in order to avoid "possible loss + of data" warnings (C4267) reported by VisualStudio. + Affects: dcmtls/libsrc/tlslayer.cc + dcmwlm/libsrc/wlds.cc + dcmwlm/libsrc/wldsfs.cc + +**** Changes from 2019.01.27 (riesmeier) + +- Removed explicit type cast from size_t parameter: + Removed explicit type cast from size_t parameter in order to get rid of + warnings reported by gcc 8.2.0 on MinGW (-Wstringop-overflow=). + Affects: ofstd/include/dcmtk/ofstd/ofbmanip.h + +**** Changes from 2019.01.25 (schlamelcher) + +- Fixes for a previous commit: + Turns out setting CMAKE_CXX_STANDARD to 98 by default (if nothing else was + requested) is a bad idea that will lead the build process to fail on various + platforms. Therefore, the old behavior of not touching CMAKE_CXX_STANDARD was + restored for all pre C++11 builds. + Replaced the CMake list(SUBLIST...) call with index based list access since + the SUBLIST command is only supported since CMake 3.7 and we dont want another + separate case that makes the CMake files even more unreadable. + Affects: CMake/GenerateDCMTKConfigure.cmake + CMake/dcmtkPrepare.cmake + +**** Changes from 2019.01.25 (eichelberg) + +- Fixed compilation with OpenSSL 1.0.1. + Affects: dcmtls/libsrc/tlslayer.cc + +**** Changes from 2019.01.24 (riesmeier) + +- Minor fixes to INSTALL file. + Affects: INSTALL + +**** Changes from 2019.01.24 (eichelberg) + +- Create list of elliptic curves for TLS dynamically: + The list of elliptic curves to be negotiated as part of a TLS + connections was so far hard-coded in DCMTK, based on the elliptic curves + with at least 256 bits that are supported in a default OpenSSL 1.0.2 + build (the oldest supported version). However, some distributions (e.g. + RHEL) ship with modified OpenSSL libraries that further restrict the + list of supported curves, causing an error in the dcmtls module. We now + test at runtime which elliptic curves are supported and only negotiate, + thus avoiding this problem. + Thanks to Peter Klotz for the bug report. + This closes DCMTK issue #863. + Affects: dcmtls/libsrc/tlslayer.cc + +**** Changes from 2019.01.23 (riesmeier) + +- Added new DIMSE status code category to summary: + Added new category for unknown/unsupported DIMSE status codes to + DcmStorageSCU::getStatusSummary(). Its output is e.g. shown after + DICOM SOP Instances have been sent with the "dcmsend" tool. + Affects: dcmnet/libsrc/dstorscu.cc + +**** Changes from 2019.01.22 (riesmeier) + +- Added full support for SR IODs from Suppl. 164: + Added constraint checker for the Performed Imaging Agent Administration SR + IOD and the Planned Imaging Agent Administration SR IOD (introduced with + Supplement 164). Now, support for these new IODs is complete with regard to + the implementation in the "dcmsr" module. + This closes DCMTK Conformance #855. + Added: dcmsr/include/dcmtk/dcmsr/dsrpficc.h + dcmsr/include/dcmtk/dcmsr/dsrplicc.h + dcmsr/libsrc/dsrpficc.cc + dcmsr/libsrc/dsrplicc.cc + Affects: dcmsr/libsrc/CMakeLists.txt + dcmsr/libsrc/Makefile.dep + dcmsr/libsrc/Makefile.in + dcmsr/libsrc/dsrtypes.cc + +**** Changes from 2019.01.21 (riesmeier) + +- Fixed inconsistent names of two SR classes: + Fixed inconsistent names of two SR constraint checker classes. + Affects: dcmsr/include/dcmtk/dcmsr/dsracqcc.h + dcmsr/include/dcmtk/dcmsr/dsrrrdcc.h + dcmsr/libsrc/dsracqcc.cc + dcmsr/libsrc/dsrrrdcc.cc + dcmsr/libsrc/dsrtypes.cc + +- Fixed broken CMake configuration (older versions): + CMake versions prior to 3.7 do not support GREATER_EQUAL, so avoid it. + Affects: CMake/dcmtkPrepare.cmake + +**** Changes from 2019.01.20 (riesmeier) + +- Removed unused local variable: + Removed unused local variable to avoid a warning reported by gcc. + Affects: dcmsign/libsrc/simaccon.cc + +- Added support for Synchronization Module: + Added support for Synchronization Module, which is required for the + Performed Imaging Agent Administration SR IOD introduced with Supplement + 164 (Contrast Agent Administration Reporting) but also for the Procedure + Log SR IOD. For all other SR IODs currently defined, this Module is either + optional or conditional (or not defined at all). + Also fixed an issue with reading additional equipment information from XML. + This partly closes DCMTK Conformance #855. + Affects: dcmsr/data/dsr2xml.xsd + dcmsr/include/dcmtk/dcmsr/dsrdoc.h + dcmsr/include/dcmtk/dcmsr/dsrtypes.h + dcmsr/libsrc/dsrdoc.cc + dcmsr/libsrc/dsrtypes.cc + +- Made use of new getNamedChildNode() method: + Made use of new method DSRXMLDocument::getNamedChildNode() in order to + get more appropriate messages to the logger in case of error, i.e. if + "cursor.getChild()" returns an invalid cursor because the current node + has no children. + Affects: dcmsr/libsrc/dsrcodtn.cc + dcmsr/libsrc/dsrcodvl.cc + dcmsr/libsrc/dsrcomtn.cc + dcmsr/libsrc/dsrdattn.cc + dcmsr/libsrc/dsrdoc.cc + dcmsr/libsrc/dsrdoctn.cc + dcmsr/libsrc/dsrdtitn.cc + dcmsr/libsrc/dsrimgtn.cc + dcmsr/libsrc/dsrpnmtn.cc + dcmsr/libsrc/dsrrefin.cc + dcmsr/libsrc/dsrtcovl.cc + dcmsr/libsrc/dsrtextn.cc + dcmsr/libsrc/dsrtimtn.cc + dcmsr/libsrc/dsruidtn.cc + dcmsr/libsrc/dsrwavtn.cc + dcmsr/libsrc/dsrwavvl.cc + +- Added new method getNamedChildNode(): + Added new method getNamedChildNode() to class DSRXMLDocument. + Affects: dcmsr/include/dcmtk/dcmsr/dsrxmld.h + dcmsr/libsrc/dsrxmld.cc + +**** Changes from 2019.01.18 (schlamelcher) + +- Added support for CMAKE_CXX_STANDARD et al: + DCMTK now understands and makes use of the CMake variable CMAKE_CXX_STANDARD + when a CMake version that supports it is employed (CMake 3.1.3 and newer). + Once supported, CMAKE_CXX_STANDARD also replaces the DCMTK_CXX11_FLAGS + variable. Setting DCMTK_CXX11_FLAGS manually in those cases will emit a + warning since the variable is now longer considered for anything. + The cache variable DCMTK_ENABLE_CXX11 was transformed into an inferable + option, i.e. it now defaults to "INFERRED", which will automatically be + transformed into TRUE given CMAKE_CXX_STANDARD is set to at least '11'. + Vice versa, setting DCMTK_ENABLE_CXX11 to TRUE will now automatically set + CMAKE_CXX_FLAGS to '11' unless anything else is set explicitly by hand. + Setting neither DCMTK_ENABLE_CXX11 nor CMAKE_CXX_STANDARD will set + CMAKE_CXX_STANDARD to '98' and DCMTK_ENABLE_CXX11 to FALSE. + In addition to the existing configuration test for C++11, DCMTK now also has + similar tests for C++14 and C++17 that are executed as appropriate based on + the value of CMAKE_CXX_STANDARD. All tests are based on ax_cxx_compile_stdcxx + from the GNU Autoconf project, an appropriate copyright notice has been + included and added to the existing C++11 configure test that incorrectly + lacked it. + DCMTK now also defines the following global CMake properties that are used for + implementing the behavior described above and might by useful for other things + in the future: + - DCMTK_CMAKE_HAS_CXX_STANDARD + - DCMTK_MODERN_CXX_STANDARD + - DCMTK_MODERN_CXX_STANDARDS + Have a look at their documentation given at the respective call to + define_property() for more information about them. + DCMTK so far does not modify the defaults for CMAKE_CXX_STANDARD_REQUIRED and + CMAKE_CXX_EXTENSIONS in any way. This implies setting CMAKE_CXX_STANDARD to + something that the employed compiler does not actually support might lead to + CMake lowering the setting to something that actually is. + This seems reasonable since such a modification will be caught by the above + mentioned configuration tests, enabling the user to resume the build process + anyway. + If some software based on DCMTK definitively requires a certain C++ standard + version, the users should set CMAKE_CXX_STANDARD_REQUIRED and + CMAKE_CXX_EXTENSIONS while building DCMTK themselves instead. + Thanks to GitHub user "hjmjohnson" for the report and suggested patch. + Added: config/tests/cxx14.cc + config/tests/cxx17.cc + Affects: CMake/GenerateDCMTKConfigure.cmake + CMake/dcmtkMacros.cmake + CMake/dcmtkPrepare.cmake + CMake/osconfig.h.in + config/tests/cxx11.cc + +**** Changes from 2019.01.15 (riesmeier) + +- Added quotation marks around filesystem paths: + Added quotation marks around filesystem paths in Doxygen configuration files + in order to support source directories e.g. with embedded space characters. + Affects: doxygen/htmldocs.cfg + doxygen/manpages.cfg + +**** Changes from 2019.01.14 (schlamelcher) + +- Changes to use newer CMake policies when available: + Adjusted top level CMakeLists.txt to automatically enable newer policies when + a newer CMake version is used, thereby improving the build features supported: + - Automatically use policy CMP0067 to ensure try_compile honors + CMAKE_CXX_STANDARD. This will prevent headers like "cstdint" from being + discovered by mistake on system like Ubuntu 17.04 where C++11 is enabled by + default. + - Support for INTERPROCEDURAL_OPTIMIZATION + - Error checking for common CMake errors (i.e. better CMake debugging) + - See https://cmake.org/cmake/help/latest/manual/cmake-policies.7.html + Thanks to GitHub user "hjmjohnson" for the report and suggested patch. + Affects: CMake/dcmtkPrepare.cmake + CMakeLists.txt + +**** Changes from 2019.01.11 (schlamelcher) + +- Enhanced top level CMakeLists.txt: + Now calling cmake_minimum_required() at the beginning of the top level + CMakeLists.txt, before calling the project() command. + It is important to establish version and policy settings before invoking + other commands whose behavior they may affect. See also CMake policy CMP0000. + Thanks to GitHub user "hjmjohnson" for the report and suggested patch. + Affects: CMakeLists.txt + +**** Changes from 2019.01.03 (riesmeier) + +- Fixed wrong parameter names (only affects BEOS). + Affects: ofstd/include/dcmtk/ofstd/offile.h + +**** Changes from 2019.01.02 (eichelberg) + +- Added explicit typecasts to avoid integer overflows: + Added explicit typecasts to avoid potential integer overflows + in some multiplications. + Thanks to GitHub user "FreddyFunk" for the patch. + Affects: dcmdata/libsrc/dcrleccd.cc + +- Minor code cleanup in RLE decoder: + Improved locality by moving loop variable local to loop. + Changed variable name to better reflect it intended purpose. + Thanks to GitHub user "FreddyFunk" for the patch. + Affects: dcmdata/libsrc/dcrleccd.cc + +**** Changes from 2018.12.23 (eichelberg) + +- Enable RSA-PSS signatures when using OpenSSL 1.1.1+: + When compiling with OpenSSL 1.1.1 or newer, enable the RSA-PSS signature + algorithms because otherwise TLS connections between a client and a server + both using OpenSSL 1.1.1 will fail. + Thanks for Peter Klotz + for the report and patch. + Affects: dcmtls/libsrc/tlslayer.cc + +**** Changes from 2018.12.22 (eichelberg) + +- Cleaned up the set of included header files. + Affects: dcmdata/apps/cda2dcm.cc + dcmdata/apps/pdf2dcm.cc + dcmdata/apps/stl2dcm.cc + dcmdata/include/dcmtk/dcmdata/dcencdoc.h + dcmdata/libsrc/dcencdoc.cc + +**** Changes from 2018.12.22 (riesmeier) + +- Only include directories that exist (CMake): + Newer versions of CMake are more picky when using unset variables, so we + need to distinguish more carefully between libtiff with and without JPEG + support (because JPEG_INCLUDE_DIR is not defined in the latter case). + Thanks to GitHub user "hjmjohnson" for the report and suggested patch. + Affects: CMake/3rdparty.cmake + +**** Changes from 2018.12.17 (riesmeier) + +- Minor fixes to text formatting: + Added missing space characters, fixed line breaks and other minor formatting + issues. + Affects: INSTALL + +**** Changes from 2018.12.17 (eichelberg) + +- Removed top-level configure script and added instructions to INSTALL how users who wish to use the Autoconf toolchain can recreate it. + Affects: INSTALL + Removed: configure + +**** Changes from 2018.12.17 (schlamelcher) + +- Fixed incorrect assumption in OVector's unit test: + Since both begin() and end() return the same iterator for an empty vector, + it is not obvious whether such an iterator shall refer to begin() or to end() + after the first insert operation. + OFVector's unit test so far assumed it would refer to begin(), but, this is + not always the case, leading to the test failing on Visual Studio 2017 when + compiled in Debug mode. + This closes DCMTK issue #859. + Thanks to Bengt Gustafsson for the report + and detailed analysis of the issue. + Affects: ofstd/tests/tvec.cc + +**** Changes from 2018.12.13 (eichelberg) + +- Reintroduced DcmTLSTransportLayer::setCipherSuites(): + Reintroduced DcmTLSTransportLayer::setCipherSuites() as a legacy alternative + to the newer methods setTLSProfile() and addCipherSuite(), in order to + simplify the migration of existing code to DCMTK 3.6.4+ + Thanks to Peter Klotz for the suggestion and patch. + Affects: dcmtls/include/dcmtk/dcmtls/tlslayer.h + dcmtls/libsrc/tlslayer.cc + +**** Changes from 2018.12.13 (schlamelcher) + +- Fixed inconsistent use of USE_STD_CXX_INCLUDES: + Ensured the macro USE_STD_CXX_INCLUDES is still/also respected for , + and , although they have their own configure tests that set + HAVE_CMATH, HAVE_CSTDINT and HAVE_CSTDDEF respectively in case they are + available. + This closes DCMTK issue #762. + Affects: ofstd/include/dcmtk/ofstd/ofstdinc.h + +**** Changes from 2018.12.13 (eichelberg) + +- Fixed typo in error message: + Thanks to Peter Klotz for the report and patch. + Affects: dcmtls/libsrc/tlsciphr.cc + dcmtls/tests/dcmtls_testsuite_run.pl + +**** Changes from 2018.12.12 (eichelberg) + +- Removed configure test for LZW support in libtiff: + Removed configure test for LZW support in libtiff since the test never + properly worked and all libtiff versions supported by DCMTK + (libtiff 3.7.4 and newer) provide LZW support anyway. + This closes DCMTK issue #229. + Affects: CMake/osconfig.h.in + config/aclocal.m4 + config/configure + config/configure.in + config/include/dcmtk/config/osconfig.h.in + dcmimage/apps/dcm2pnm.cc + +**** Changes from 2018.12.11 (eichelberg) + +- Fixed OpenJPEG detection on Win32. + Affects: CMake/3rdparty.cmake + +**** Changes from 2018.12.07 (riesmeier) + +- Fixed CMake error if "FindPkgConfig" is missing: + Fixed CMake error during configure run on systems where the CMake module + "FindPkgConfig.cmake" is missing. This bug has been introduced only + recently with a commit that searches for the OpenJPEG library. + Thanks to GitHub user "agravgaard" (Andreas Gravgaard Andersen) for the + original pull request. + Affects: CMake/FindOpenJPEG.cmake + +**** Changes from 2018.12.07 (eichelberg) + +- Improved compilation instructions for Linux/Unix: + Improved the compilation/installation instructions for building DCMTK + on Linux/Posix systems without graphical user interface. + Thanks to Alexander Haderer for the contribution. + Affects: INSTALL + +- Updated the names of some private GE tags: + Updated the names of some private GE tags as documented in + https://www.gehealthcare.com/-/media/1587e4b3d7b440e8b4d4178da553e085.pdf + Thanks to github user eborisch for the patch. + Affects: dcmdata/data/private.dic + +**** Changes from 2018.12.06 (riesmeier) + +- Initial support for new SR types (Supplement 164): + Added initial support for the new SR document types introduced with + Supplement 164 (Contrast Agent Administration Reporting). The two types + "Planned Imaging Agent Administration SR" and "Performed Imaging Agent + Administration SR" are now known to the "dcmsr" module but cannot be + used since the "IOD Constraint Checkers" still have to be implemented. + This partly closes DCMTK Conformance #855. + Affects: dcmsr/data/dsr2xml.xsd + dcmsr/include/dcmtk/dcmsr/dsrdoc.h + dcmsr/include/dcmtk/dcmsr/dsrtypes.h + dcmsr/libsrc/dsrtypes.cc + +- Added support for new "SR" SOP Classes: + Added support for recently approved Structured Reporting (SR) SOP + Classes to the DICOMDIR generation code and to the DICOM Q/R SCP. + Affects: dcmdata/libsrc/dcddirif.cc + dcmqrdb/libsrc/dcmqrdbi.cc + +- Added support for directory record "RADIOTHERAPY": + Added support for new directory record type "RADIOTHERAPY" introduced with + Supplement 147 (Second Generation Radiotherapy - Prescription and Segment + Annotation). + This closes DCMTK Conformance #854. + Affects: dcmdata/include/dcmtk/dcmdata/dcddirif.h + dcmdata/include/dcmtk/dcmdata/dcdirrec.h + dcmdata/libsrc/dcddirif.cc + dcmdata/libsrc/dcdirrec.cc + +- Added definition of new Storage SOP Class UIDs: + Updated list of Storage SOP Class UIDs known to the DCMTK based on DICOM + 2018e. This includes the Final Text versions of Supplement 147 and 164. + Affects: dcmdata/include/dcmtk/dcmdata/dcuid.h + dcmdata/libsrc/dcuid.cc + dcmnet/docs/movescu.man + dcmnet/docs/storescp.man + dcmnet/etc/storescp.cfg + dcmnet/etc/storescu.cfg + dcmqrdb/docs/dcmqrscp.man + dcmqrdb/etc/dcmqrprf.cfg + +**** Changes from 2018.12.03 (riesmeier) + +- Fixed coding style of last commit: + Fixed source code formatting and used "const" specifier where appropriate. + This partly changes the last commit (which was apparently not ready to be + pushed). + Affects: dcmdata/libsrc/dcvrobow.cc + +- Reverted changes from last commit: + Reverted changes from last commit since the required modifications have been + done already some months ago with commit fe014f3. + Affects: dcmimage/libsrc/dicoimg.cc + dcmimgle/libsrc/diimage.cc + dcmpstat/apps/dcmp2pgm.cc + dcmqrdb/libsrc/dcmqrdbi.cc + dcmsign/libsrc/simaccon.cc + +**** Changes from 2018.12.03 (arizpegomez) + +- Included patch to remove -Wunused-result warnings: + Using fwrite() and fgets() without checking the return value produces + warnings on Debian/GNU Linux systems (because -Wunused-results is set by + default). This patch assigns them to a size_t and removes these warnings. + Thanks to Mathieu Malaterre for the patch. + Affects: dcmimgle/libsrc/diimage.cc + +- Included patch to remove -Wunused-result warnings: + Using fwrite() and fgets() without checking the return value produces + warnings on Debian/GNU Linux systems (because -Wunused-results is set by + default). This patch assigns them to a size_t and removes these warnings. + Thanks to Mathieu Malaterre for the patch. + Affects: dcmdata/libsrc/dcvrobow.cc + dcmimage/libsrc/dicoimg.cc + dcmimgle/libsrc/diimage.cc + dcmpstat/apps/dcmp2pgm.cc + dcmqrdb/libsrc/dcmqrdbi.cc + dcmsign/libsrc/simaccon.cc + +**** Changes from 2018.12.03 (eichelberg) + +- Added configure test to detect the OpenJPEG library. + Added: CMake/FindOpenJPEG.cmake + Affects: CMake/3rdparty.cmake + CMake/DCMTKConfig.cmake.in + CMake/DCMTKConfig.old_cmake.in + CMake/dcmtkPrepare.cmake + CMake/osconfig.h.in + config/aclocal.m4 + config/configure + config/configure.in + config/include/dcmtk/config/osconfig.h.in + +- Added configure tests for getrusage, gettimeofday: + Added configure tests for getrusage() and gettimeofday(). + Affects: CMake/GenerateDCMTKConfigure.cmake + CMake/osconfig.h.in + config/configure + config/configure.in + config/include/dcmtk/config/osconfig.h.in + +**** Changes from 2018.12.03 (riesmeier) + +- Updated code definitions for DICOM 2018e: + Updated automatically generated code definitions for coding scheme "DCM", + "NCIt" and "UMLS". + Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h + dcmsr/include/dcmtk/dcmsr/codes/ncit.h + dcmsr/include/dcmtk/dcmsr/codes/umls.h + +- Updated data dictionary for DICOM 2018e: + Updated data dictionary for the latest edition of the DICOM standard, which + has been released only recently (2018-11-22). + Affects: dcmdata/data/dicom.dic + dcmdata/include/dcmtk/dcmdata/dcdeftag.h + dcmdata/libsrc/dcdictbi.cc + +**** Changes from 2018.11.30 (schlamelcher) + +- Updated version information for 3.6.4+ development: + Updated version information marking the start of DCMTK development post minor + release 3.6.4. + Moved official ANNOUNCE file of the DCMTK release 3.6.4 to the "docs" + subfolder and replaced the main ANNOUNCE file with a "dummy". + Added: docs/ANNOUNCE.364 + Affects: ANNOUNCE + CMake/dcmtkPrepare.cmake + VERSION + config/configure + config/configure.in diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt index dbee9474..0aa6292f 100644 --- a/doxygen/CMakeLists.txt +++ b/doxygen/CMakeLists.txt @@ -8,10 +8,9 @@ if(DCMTK_WITH_DOXYGEN) add_custom_target(DOXYGEN) add_custom_target(html "${DOXYGEN_EXECUTABLE}" htmldocs.tmp) add_dependencies(DOXYGEN html) - if(NOT WIN32) # For Unix systems, also build manpages + if(DCMTK_ENABLE_MANPAGES) add_custom_target(man COMMAND "${DOXYGEN_EXECUTABLE}" manpages.tmp - COMMAND rm -f "${CMAKE_CURRENT_BINARY_DIR}/manpages/man1/*.man.1" - COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/patchman.sh") + COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/patchman.cmake") add_dependencies(DOXYGEN man) add_custom_target(man2text COMMAND "${CMAKE_COMMAND}" -E make_directory man2text COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/man2text.sh") @@ -25,17 +24,17 @@ if(DCMTK_WITH_DOXYGEN) endif() # create configuration files (expand variables) - set(DCMTK_VERSION "${DCMTK_PACKAGE_VERSION}${PACKAGE_VERSION_SUFFIX}") + set(DCMTK_VERSION "${DCMTK_PACKAGE_VERSION}${DCMTK_PACKAGE_VERSION_SUFFIX}") set(DOXYGEN_INPUT_DIR "${CMAKE_SOURCE_DIR}") set(DOXYGEN_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/htmldocs.cfg" "${CMAKE_CURRENT_BINARY_DIR}/htmldocs.tmp" ESCAPE_QUOTES @ONLY) - if(NOT WIN32) + if(DCMTK_ENABLE_MANPAGES) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/manpages.cfg" "${CMAKE_CURRENT_BINARY_DIR}/manpages.tmp" ESCAPE_QUOTES @ONLY) endif() # Make sure these directories exist when we try to install them install(CODE "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/htmldocs\")" COMPONENT html) - if(NOT WIN32) + if(DCMTK_ENABLE_MANPAGES) install(CODE "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/manpages\")" COMPONENT man) endif() @@ -44,7 +43,7 @@ if(DCMTK_WITH_DOXYGEN) if(DCMTK_GENERATE_DOXYGEN_TAGFILE) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_TAGFILE}" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT html OPTIONAL) endif() - if(NOT WIN32) + if(DCMTK_ENABLE_MANPAGES) file(GLOB_RECURSE MANPAGES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/manpages/" "${CMAKE_CURRENT_SOURCE_DIR}/manpages/*.1") foreach(MANPAGE ${MANPAGES}) if("${CMAKE_CURRENT_SOURCE_DIR}/manpages/${MANPAGE}" IS_NEWER_THAN "${CMAKE_CURRENT_BINARY_DIR}/manpages/${MANPAGE}") @@ -65,8 +64,8 @@ if(DCMTK_WITH_DOXYGEN) else() - # by default, install the pre-defined manpages, i.e. the ones shipped with this package - if(NOT WIN32) + if(DCMTK_ENABLE_MANPAGES) + # since Doxygen is not available, install the pre-defined manpages, i.e. the ones shipped with this package install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/manpages/" DESTINATION "${CMAKE_INSTALL_MANDIR}" COMPONENT man) endif() diff --git a/doxygen/htmldocs.cfg b/doxygen/htmldocs.cfg index 5e9f11d2..3c7361cc 100644 --- a/doxygen/htmldocs.cfg +++ b/doxygen/htmldocs.cfg @@ -152,7 +152,7 @@ FULL_PATH_NAMES = YES # will be relative from the directory where doxygen is started. # This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = @DOXYGEN_INPUT_DIR@ +STRIP_FROM_PATH = "@DOXYGEN_INPUT_DIR@" # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # path mentioned in the documentation of a class, which tells the reader which @@ -672,7 +672,7 @@ FILE_VERSION_FILTER = # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE # tag is left empty. -LAYOUT_FILE = @DOXYGEN_INPUT_DIR@/doxygen/layout.xml +LAYOUT_FILE = "@DOXYGEN_INPUT_DIR@/doxygen/layout.xml" # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib @@ -753,7 +753,7 @@ WARN_LOGFILE = htmldocs.log # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = @DOXYGEN_INPUT_DIR@ +INPUT = "@DOXYGEN_INPUT_DIR@" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -790,9 +790,9 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = @DOXYGEN_INPUT_DIR@/config/include \ - @DOXYGEN_INPUT_DIR@/docs \ - @DOXYGEN_INPUT_DIR@/ofstd/include/dcmtk/ofstd/variadic +EXCLUDE = "@DOXYGEN_INPUT_DIR@/config/include" \ + "@DOXYGEN_INPUT_DIR@/docs" \ + "@DOXYGEN_INPUT_DIR@/ofstd/include/dcmtk/ofstd/variadic" # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded @@ -825,7 +825,7 @@ EXCLUDE_SYMBOLS = # that contain example code fragments that are included (see the \include # command). -EXAMPLE_PATH = @DOXYGEN_INPUT_DIR@ +EXAMPLE_PATH = "@DOXYGEN_INPUT_DIR@" # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and @@ -1078,7 +1078,7 @@ HTML_HEADER = # that doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = @DOXYGEN_DATA_DIR@/footer.html +HTML_FOOTER = "@DOXYGEN_DATA_DIR@/footer.html" # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of diff --git a/doxygen/manpages.cfg b/doxygen/manpages.cfg index 526cdc5d..d1c69c00 100644 --- a/doxygen/manpages.cfg +++ b/doxygen/manpages.cfg @@ -753,7 +753,7 @@ WARN_LOGFILE = manpages.log # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = @DOXYGEN_INPUT_DIR@ +INPUT = "@DOXYGEN_INPUT_DIR@" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -788,9 +788,9 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = @DOXYGEN_INPUT_DIR@/config \ - @DOXYGEN_INPUT_DIR@/docs \ - @DOXYGEN_INPUT_DIR@/doxygen +EXCLUDE = "@DOXYGEN_INPUT_DIR@/config" \ + "@DOXYGEN_INPUT_DIR@/docs" \ + "@DOXYGEN_INPUT_DIR@/doxygen" # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/doxygen/manpages/man1/cda2dcm.1 b/doxygen/manpages/man1/cda2dcm.1 index 934369f2..757eb275 100644 --- a/doxygen/manpages/man1/cda2dcm.1 +++ b/doxygen/manpages/man1/cda2dcm.1 @@ -1,4 +1,4 @@ -.TH "cda2dcm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "cda2dcm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME cda2dcm \- Encapsulate CDA file into DICOM file format diff --git a/doxygen/manpages/man1/dcm2json.1 b/doxygen/manpages/man1/dcm2json.1 index f2c68191..36599b10 100644 --- a/doxygen/manpages/man1/dcm2json.1 +++ b/doxygen/manpages/man1/dcm2json.1 @@ -1,4 +1,4 @@ -.TH "dcm2json" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcm2json" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcm2json \- Convert DICOM file and data set to JSON diff --git a/doxygen/manpages/man1/dcm2pdf.1 b/doxygen/manpages/man1/dcm2pdf.1 index 9c7b1340..91e2a669 100644 --- a/doxygen/manpages/man1/dcm2pdf.1 +++ b/doxygen/manpages/man1/dcm2pdf.1 @@ -1,4 +1,4 @@ -.TH "dcm2pdf" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcm2pdf" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcm2pdf \- Extract PDF file from DICOM encapsulated PDF diff --git a/doxygen/manpages/man1/dcm2pnm.1 b/doxygen/manpages/man1/dcm2pnm.1 index e0438813..d739b52b 100644 --- a/doxygen/manpages/man1/dcm2pnm.1 +++ b/doxygen/manpages/man1/dcm2pnm.1 @@ -1,4 +1,4 @@ -.TH "dcm2pnm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcm2pnm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcm2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF or BMP diff --git a/doxygen/manpages/man1/dcm2xml.1 b/doxygen/manpages/man1/dcm2xml.1 index 95d4f5a1..72f1554c 100644 --- a/doxygen/manpages/man1/dcm2xml.1 +++ b/doxygen/manpages/man1/dcm2xml.1 @@ -1,4 +1,4 @@ -.TH "dcm2xml" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcm2xml" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcm2xml \- Convert DICOM file and data set to XML @@ -223,18 +223,18 @@ The 'file-format' and 'meta-header' tags are absent for DICOM data sets\&. .SS "XML Encoding" Attributes with very large value fields (e\&.g\&. pixel data) are not loaded by default\&. They can be identified by the additional attribute 'loaded' with a value of 'no' (see example above)\&. The command line option \fI--load-all\fP forces to load all value fields including the very long ones\&. .PP -Furthermore, binary information of OB and OW attributes are not written to the XML output file by default\&. These elements can be identified by the additional attribute 'binary' with a value of 'hidden' (default is 'no')\&. The command line option \fI--write-binary-data\fP causes also binary value fields to be printed (attribute value is 'yes' or 'base64')\&. But, be careful when using this option together with \fI--load-all\fP because of the large amounts of pixel data that might be printed to the output\&. Please note that in this context element values with a VR of OD or OF are not regarded as 'binary information'\&. +Furthermore, binary data of OB and OW attributes are not written to the XML output file by default\&. These elements can be identified by the additional attribute 'binary' with a value of 'hidden' (default is 'no')\&. The command line option \fI--write-binary-data\fP causes also binary value fields to be printed (attribute value is 'yes' or 'base64')\&. But, be careful when using this option together with \fI--load-all\fP because of the large amounts of pixel data that might be printed to the output\&. Please note that in this context element values with a VR of OD, OF, OL and OV are not regarded as 'binary data'\&. .PP Multiple values (i\&.e\&. where the DICOM value multiplicity is greater than 1) are separated by a backslash '\\' (except for Base64 encoded data)\&. The 'len' attribute indicates the number of bytes for the particular value field as stored in the DICOM data set, i\&.e\&. it might deviate from the XML encoded value length e\&.g\&. because of non-significant padding that has been removed\&. If this attribute is missing in 'sequence' or 'item' start tags, the corresponding DICOM element has been stored with undefined length\&. .SH "Native DICOM Model Format" .PP The description of the Native DICOM Model format can be found in the DICOM standard, part 19 ('Application Hosting')\&. .SS "Bulk Data" -Binary data, i\&.e\&. DICOM element values with Value Representations (VR) of OB or OW, as well as OD, OF and UN values are by default not written to the XML output because of their size\&. Instead, for each element, a new Universally Unique Identifier (UUID) is being generated and written as an attribute of a XML element\&. So far, there is no possibility to write an additional file to hold the binary data for each of the binary data chunks\&. This is not required by the standard, however, it might be useful for implementing an Application Hosting interface; thus this feature may be available in future versions of \fBdcm2xml\fP\&. +Binary data, i\&.e\&. DICOM element values with Value Representations (VR) of OB or OW, as well as OD, OF, OV and UN values are by default not written to the XML output because of their size\&. Instead, for each element, a new Universally Unique Identifier (UUID) is being generated and written as an attribute of a XML element\&. So far, there is no possibility to write an additional file to hold the binary data for each of the binary data chunks\&. This is not required by the standard, however, it might be useful for implementing an Application Hosting interface; thus this feature may be available in future versions of \fBdcm2xml\fP\&. .PP -In addition, Supplement 163 (Store Over the Web by Representational State Transfer Services) introduces a new XML element that allows for encoding binary data as Base64\&. Currently, the command line option \fI--encode-base64\fP enables this encoding for the following VRs: OB, OD, OF, OW, and UN\&. +In addition, Supplement 163 (Store Over the Web by Representational State Transfer Services) introduces a new XML element that allows for encoding binary data as Base64\&. Currently, the command line option \fI--encode-base64\fP enables this encoding for the following VRs: OB, OD, OF, OV, OW and UN\&. .SS "Known Issues" -In addition to what is written in the above section on 'Bulk Data', there are further known issues with the current implementation of the Native DICOM Model format\&. For example, large element values with a VR other than OB, OD, OF, OW or UN are currently never written as bulk data, although it might be useful, e\&.g\&. for very long text elements (especially UT) or very long numeric fields (of various VRs)\&. +In addition to what is written in the above section on 'Bulk Data', there are further known issues with the current implementation of the Native DICOM Model format\&. For example, large element values with a VR other than OB, OD, OF, OV, OW or UN are currently never written as bulk data, although it might be useful, e\&.g\&. for very long text elements (especially UT) or very long numeric fields (of various VRs)\&. .SH "NOTES" .PP .SS "Character Encoding" @@ -259,6 +259,8 @@ Hebrew "ISO_IR 138" => "ISO-8859-8" If this DICOM attribute is missing in the input file, although needed, option \fI--charset-assume\fP can be used to specify an appropriate character set manually (using one of the DICOM defined terms)\&. For reasons of backward compatibility with previous versions of this tool, the following terms are also supported and mapped automatically to the associated DICOM defined terms: latin-1, latin-2, latin-3, latin-4, latin-5, cyrillic, arabic, greek, hebrew\&. .PP Multiple character sets using code extension techniques are not supported\&. If needed, option \fI--convert-to-utf8\fP can be used to convert the DICOM file or data set to UTF-8 encoding prior to the conversion to XML format\&. This is also useful for DICOMDIR files where each directory record can have a different character set\&. +.PP +If no mapping is defined and option \fI--convert-to-utf8\fP is not used, non-ASCII characters and those below #32 are stored as '&#nnn;' where 'nnn' refers to the numeric character code\&. This might lead to invalid character entity references (such as '' for ESC) and will cause most XML parsers to reject the document\&. .SH "LOGGING" .PP The level of logging output of the various command line tools and underlying libraries can be specified by the user\&. By default, only errors and warnings are written to the standard error stream\&. Using option \fI--verbose\fP also informational messages like processing details are reported\&. Option \fI--debug\fP can be used to get more details on the internal activity, e\&.g\&. for debugging purposes\&. Other logging levels can be selected using option \fI--log-level\fP\&. In \fI--quiet\fP mode only fatal errors are reported\&. In such very severe error events, the application will usually terminate\&. For more details on the different logging levels, see documentation of module 'oflog'\&. @@ -284,4 +286,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBxml2dcm\fP(1), \fBdcmconv\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2002-2016 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2002-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/dcmcjpeg.1 b/doxygen/manpages/man1/dcmcjpeg.1 index 82d651f4..67cdca11 100644 --- a/doxygen/manpages/man1/dcmcjpeg.1 +++ b/doxygen/manpages/man1/dcmcjpeg.1 @@ -1,4 +1,4 @@ -.TH "dcmcjpeg" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmcjpeg" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmcjpeg \- Encode DICOM file to JPEG transfer syntax diff --git a/doxygen/manpages/man1/dcmcjpls.1 b/doxygen/manpages/man1/dcmcjpls.1 index 185c00b3..f8ac8bc4 100644 --- a/doxygen/manpages/man1/dcmcjpls.1 +++ b/doxygen/manpages/man1/dcmcjpls.1 @@ -1,4 +1,4 @@ -.TH "dcmcjpls" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmcjpls" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmcjpls \- Encode DICOM file to JPEG-LS transfer syntax @@ -128,21 +128,21 @@ lossless compression: JPEG-LS compression: - +t1 --threshold1 [t]hreshhold: integer (default for 8 bpp: 3) + +t1 --threshold1 [t]hreshhold: integer set JPEG-LS encoding parameter threshold 1 - +t2 --threshold2 [t]hreshhold: integer (default for 8 bpp: 7) + +t2 --threshold2 [t]hreshhold: integer set JPEG-LS encoding parameter threshold 2 - +t3 --threshold3 [t]hreshhold: integer (default for 8 bpp: 21) + +t3 --threshold3 [t]hreshhold: integer set JPEG-LS encoding parameter threshold 3 + # By default, the values for T1, T2, T3 are computed based on + # the number of bits per sample. + +rs --reset [r]eset: integer (default: 64) set JPEG-LS encoding parameter reset - +lm --limit [l]imit: integer (default: 0) - set JPEG-LS encoding parameter limit - JPEG-LS interleave: +il --interleave-line @@ -172,7 +172,22 @@ JPEG-LS interleave: # This flag selects an interleave mode based on the source image's mode. # If possible, the image is not converted to a different interleave mode. -.fi + +JPEG-LS padding of odd-length bitstreams: + + +ps --padding-standard + pad with extended EOI marker (default) + + # Pad odd-length JPEG-LS bitstreams by writing an extended end of image + # segment marker FF FF D9, as required by the DICOM standard. + + +pz --padding-zero + pad with zero byte (non-standard) + + # Pad odd-length JPEG-LS bitstreams by writing a zero byte after the + # end of image segment marker, i.e. FF D9 00. This is not DICOM conformant + # but required for interoperability with the HP LOCO reference implementation, + # which does not support extended JPEG-LS bitstreams..fi .PP .SS "encapsulated pixel data encoding options" .PP @@ -330,4 +345,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBdcmdjpls\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2009-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2009-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/dcmconv.1 b/doxygen/manpages/man1/dcmconv.1 index 7ca68c72..cc6d6033 100644 --- a/doxygen/manpages/man1/dcmconv.1 +++ b/doxygen/manpages/man1/dcmconv.1 @@ -1,4 +1,4 @@ -.TH "dcmconv" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmconv" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmconv \- Convert DICOM file encoding diff --git a/doxygen/manpages/man1/dcmcrle.1 b/doxygen/manpages/man1/dcmcrle.1 index dabab557..d02e8c1c 100644 --- a/doxygen/manpages/man1/dcmcrle.1 +++ b/doxygen/manpages/man1/dcmcrle.1 @@ -1,4 +1,4 @@ -.TH "dcmcrle" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmcrle" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmcrle \- Encode DICOM file to RLE transfer syntax diff --git a/doxygen/manpages/man1/dcmdjpeg.1 b/doxygen/manpages/man1/dcmdjpeg.1 index c40547b0..7a2e7395 100644 --- a/doxygen/manpages/man1/dcmdjpeg.1 +++ b/doxygen/manpages/man1/dcmdjpeg.1 @@ -1,4 +1,4 @@ -.TH "dcmdjpeg" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmdjpeg" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmdjpeg \- Decode JPEG-compressed DICOM file @@ -110,9 +110,11 @@ color space conversion: # and convert to RGB. +cn --conv-never - never convert color space + never convert YCbCr to RGB - # Never convert color space during decompression. + # Never convert color space from YCbCr to RGB during decompression. + # Note that a conversion from YBR_FULL_422 to YBR_FULL will still take + # place if the source images has been compressed with subsampling. planar configuration: @@ -297,4 +299,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBdcmcjpeg\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2001-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2001-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/dcmdjpls.1 b/doxygen/manpages/man1/dcmdjpls.1 index 822d2249..1ce5cc83 100644 --- a/doxygen/manpages/man1/dcmdjpls.1 +++ b/doxygen/manpages/man1/dcmdjpls.1 @@ -1,4 +1,4 @@ -.TH "dcmdjpls" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmdjpls" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmdjpls \- Decode JPEG-LS compressed DICOM file @@ -119,6 +119,11 @@ SOP Instance UID: # Always assigns a new SOP instance UID. +workaround options for incorrect JPEG-LS encodings: + + +wi --workaround-incpl + enable workaround for incomplete JPEG-LS data + other processing options: +io --ignore-offsettable diff --git a/doxygen/manpages/man1/dcmdrle.1 b/doxygen/manpages/man1/dcmdrle.1 index 0f49071d..4e016c4b 100644 --- a/doxygen/manpages/man1/dcmdrle.1 +++ b/doxygen/manpages/man1/dcmdrle.1 @@ -1,4 +1,4 @@ -.TH "dcmdrle" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmdrle" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmdrle \- Decode RLE-compressed DICOM file diff --git a/doxygen/manpages/man1/dcmdspfn.1 b/doxygen/manpages/man1/dcmdspfn.1 index 4705c273..6c2fd3a0 100644 --- a/doxygen/manpages/man1/dcmdspfn.1 +++ b/doxygen/manpages/man1/dcmdspfn.1 @@ -1,4 +1,4 @@ -.TH "dcmdspfn" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmdspfn" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmdspfn \- Export standard display curves to a text file diff --git a/doxygen/manpages/man1/dcmdump.1 b/doxygen/manpages/man1/dcmdump.1 index 07ad0647..0071f849 100644 --- a/doxygen/manpages/man1/dcmdump.1 +++ b/doxygen/manpages/man1/dcmdump.1 @@ -1,4 +1,4 @@ -.TH "dcmdump" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmdump" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmdump \- Dump DICOM file and data set diff --git a/doxygen/manpages/man1/dcmftest.1 b/doxygen/manpages/man1/dcmftest.1 index 5b96f3ca..32164045 100644 --- a/doxygen/manpages/man1/dcmftest.1 +++ b/doxygen/manpages/man1/dcmftest.1 @@ -1,4 +1,4 @@ -.TH "dcmftest" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmftest" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmftest \- Test if file uses DICOM part 10 format diff --git a/doxygen/manpages/man1/dcmgpdir.1 b/doxygen/manpages/man1/dcmgpdir.1 index 83b88eb2..51031df5 100644 --- a/doxygen/manpages/man1/dcmgpdir.1 +++ b/doxygen/manpages/man1/dcmgpdir.1 @@ -1,4 +1,4 @@ -.TH "dcmgpdir" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmgpdir" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmgpdir \- Create a general purpose DICOMDIR diff --git a/doxygen/manpages/man1/dcmicmp.1 b/doxygen/manpages/man1/dcmicmp.1 index 917d885b..25f668bf 100644 --- a/doxygen/manpages/man1/dcmicmp.1 +++ b/doxygen/manpages/man1/dcmicmp.1 @@ -1,4 +1,4 @@ -.TH "dcmicmp" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmicmp" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmicmp \- Compare DICOM images and compute difference metrics diff --git a/doxygen/manpages/man1/dcmj2pnm.1 b/doxygen/manpages/man1/dcmj2pnm.1 index 6d10ccd3..942ee2ac 100644 --- a/doxygen/manpages/man1/dcmj2pnm.1 +++ b/doxygen/manpages/man1/dcmj2pnm.1 @@ -1,4 +1,4 @@ -.TH "dcmj2pnm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmj2pnm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmj2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF, JPEG or BMP diff --git a/doxygen/manpages/man1/dcml2pnm.1 b/doxygen/manpages/man1/dcml2pnm.1 index 8226b89c..4805c785 100644 --- a/doxygen/manpages/man1/dcml2pnm.1 +++ b/doxygen/manpages/man1/dcml2pnm.1 @@ -1,4 +1,4 @@ -.TH "dcml2pnm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcml2pnm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcml2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF or BMP diff --git a/doxygen/manpages/man1/dcmmkcrv.1 b/doxygen/manpages/man1/dcmmkcrv.1 index 027dbb63..a66766a7 100644 --- a/doxygen/manpages/man1/dcmmkcrv.1 +++ b/doxygen/manpages/man1/dcmmkcrv.1 @@ -1,4 +1,4 @@ -.TH "dcmmkcrv" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmmkcrv" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmmkcrv \- Add 2D curve data to image diff --git a/doxygen/manpages/man1/dcmmkdir.1 b/doxygen/manpages/man1/dcmmkdir.1 index e56cbcdd..cc7c784a 100644 --- a/doxygen/manpages/man1/dcmmkdir.1 +++ b/doxygen/manpages/man1/dcmmkdir.1 @@ -1,4 +1,4 @@ -.TH "dcmmkdir" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmmkdir" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmmkdir \- Create a DICOMDIR file diff --git a/doxygen/manpages/man1/dcmmklut.1 b/doxygen/manpages/man1/dcmmklut.1 index 2fa719da..8870b8c7 100644 --- a/doxygen/manpages/man1/dcmmklut.1 +++ b/doxygen/manpages/man1/dcmmklut.1 @@ -1,4 +1,4 @@ -.TH "dcmmklut" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmmklut" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmmklut \- Create DICOM look-up tables diff --git a/doxygen/manpages/man1/dcmodify.1 b/doxygen/manpages/man1/dcmodify.1 index f9b07da4..a87f9b0e 100644 --- a/doxygen/manpages/man1/dcmodify.1 +++ b/doxygen/manpages/man1/dcmodify.1 @@ -1,4 +1,4 @@ -.TH "dcmodify" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmodify" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmodify \- Modify DICOM files diff --git a/doxygen/manpages/man1/dcmp2pgm.1 b/doxygen/manpages/man1/dcmp2pgm.1 index 1722ef91..3b16c7bd 100644 --- a/doxygen/manpages/man1/dcmp2pgm.1 +++ b/doxygen/manpages/man1/dcmp2pgm.1 @@ -1,4 +1,4 @@ -.TH "dcmp2pgm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmp2pgm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmp2pgm \- Read DICOM image and presentation state and render bitmap diff --git a/doxygen/manpages/man1/dcmprscp.1 b/doxygen/manpages/man1/dcmprscp.1 index 3f99960e..3d94739f 100644 --- a/doxygen/manpages/man1/dcmprscp.1 +++ b/doxygen/manpages/man1/dcmprscp.1 @@ -1,4 +1,4 @@ -.TH "dcmprscp" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmprscp" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmprscp \- DICOM basic grayscale print management SCP diff --git a/doxygen/manpages/man1/dcmprscu.1 b/doxygen/manpages/man1/dcmprscu.1 index b7ae6a50..3fa91104 100644 --- a/doxygen/manpages/man1/dcmprscu.1 +++ b/doxygen/manpages/man1/dcmprscu.1 @@ -1,4 +1,4 @@ -.TH "dcmprscu" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmprscu" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmprscu \- Print spooler for presentation state viewer diff --git a/doxygen/manpages/man1/dcmpschk.1 b/doxygen/manpages/man1/dcmpschk.1 index 6cbc16a5..61d4ec77 100644 --- a/doxygen/manpages/man1/dcmpschk.1 +++ b/doxygen/manpages/man1/dcmpschk.1 @@ -1,4 +1,4 @@ -.TH "dcmpschk" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmpschk" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmpschk \- Checking tool for presentation states diff --git a/doxygen/manpages/man1/dcmpsmk.1 b/doxygen/manpages/man1/dcmpsmk.1 index 0db52369..e5742b74 100644 --- a/doxygen/manpages/man1/dcmpsmk.1 +++ b/doxygen/manpages/man1/dcmpsmk.1 @@ -1,4 +1,4 @@ -.TH "dcmpsmk" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmpsmk" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmpsmk \- Create DICOM grayscale softcopy presentation state diff --git a/doxygen/manpages/man1/dcmpsprt.1 b/doxygen/manpages/man1/dcmpsprt.1 index 1bdc27dc..187cfb09 100644 --- a/doxygen/manpages/man1/dcmpsprt.1 +++ b/doxygen/manpages/man1/dcmpsprt.1 @@ -1,4 +1,4 @@ -.TH "dcmpsprt" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmpsprt" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmpsprt \- Read DICOM images and presentation states and render print job diff --git a/doxygen/manpages/man1/dcmpsrcv.1 b/doxygen/manpages/man1/dcmpsrcv.1 index 0c6ab6c4..f0f46548 100644 --- a/doxygen/manpages/man1/dcmpsrcv.1 +++ b/doxygen/manpages/man1/dcmpsrcv.1 @@ -1,4 +1,4 @@ -.TH "dcmpsrcv" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmpsrcv" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmpsrcv \- Network receive for presentation state viewer diff --git a/doxygen/manpages/man1/dcmpssnd.1 b/doxygen/manpages/man1/dcmpssnd.1 index 052ac089..5a140240 100644 --- a/doxygen/manpages/man1/dcmpssnd.1 +++ b/doxygen/manpages/man1/dcmpssnd.1 @@ -1,4 +1,4 @@ -.TH "dcmpssnd" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmpssnd" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmpssnd \- Network send for presentation state viewer diff --git a/doxygen/manpages/man1/dcmqridx.1 b/doxygen/manpages/man1/dcmqridx.1 index 72f736a7..5fb96897 100644 --- a/doxygen/manpages/man1/dcmqridx.1 +++ b/doxygen/manpages/man1/dcmqridx.1 @@ -1,4 +1,4 @@ -.TH "dcmqridx" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmqridx" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmqridx \- Register a DICOM image file in an image database index file diff --git a/doxygen/manpages/man1/dcmqrscp.1 b/doxygen/manpages/man1/dcmqrscp.1 index 811c0492..ef668f0b 100644 --- a/doxygen/manpages/man1/dcmqrscp.1 +++ b/doxygen/manpages/man1/dcmqrscp.1 @@ -1,4 +1,4 @@ -.TH "dcmqrscp" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmqrscp" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmqrscp \- DICOM image archive (central test node) @@ -818,6 +818,8 @@ ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88. AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1 EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1 EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2 @@ -837,6 +839,10 @@ RTBrachyTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481 RTTreatmentSummaryRecordStorage 1.2.840.10008.5.1.4.1.1.481.7 RTIonPlanStorage 1.2.840.10008.5.1.4.1.1.481.8 RTIonBeamsTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481.9 +RTPhysicianIntentStorage 1.2.840.10008.5.1.4.1.1.481.10 +RTSegmentAnnotationStorage 1.2.840.10008.5.1.4.1.1.481.11 +RTRadiationSetStorage 1.2.840.10008.5.1.4.1.1.481.12 +CArmPhotonElectronRadiationStorage 1.2.840.10008.5.1.4.1.1.481.13 DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501.1 DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1 DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2 @@ -990,4 +996,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBdcmqridx\fP(1), \fBdcmqrti\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 1993-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 1993-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/dcmqrti.1 b/doxygen/manpages/man1/dcmqrti.1 index 2ef941a5..146b723b 100644 --- a/doxygen/manpages/man1/dcmqrti.1 +++ b/doxygen/manpages/man1/dcmqrti.1 @@ -1,4 +1,4 @@ -.TH "dcmqrti" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmqrti" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmqrti \- The Terminal Initiator Telnet Client Program diff --git a/doxygen/manpages/man1/dcmquant.1 b/doxygen/manpages/man1/dcmquant.1 index f2714f08..98e69f9a 100644 --- a/doxygen/manpages/man1/dcmquant.1 +++ b/doxygen/manpages/man1/dcmquant.1 @@ -1,4 +1,4 @@ -.TH "dcmquant" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmquant" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmquant \- Convert DICOM color images to palette color diff --git a/doxygen/manpages/man1/dcmrecv.1 b/doxygen/manpages/man1/dcmrecv.1 index 984f2d86..d004899f 100644 --- a/doxygen/manpages/man1/dcmrecv.1 +++ b/doxygen/manpages/man1/dcmrecv.1 @@ -1,4 +1,4 @@ -.TH "dcmrecv" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmrecv" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmrecv \- Simple DICOM storage SCP (receiver) diff --git a/doxygen/manpages/man1/dcmscale.1 b/doxygen/manpages/man1/dcmscale.1 index 9048fbdd..be9b53bd 100644 --- a/doxygen/manpages/man1/dcmscale.1 +++ b/doxygen/manpages/man1/dcmscale.1 @@ -1,4 +1,4 @@ -.TH "dcmscale" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmscale" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmscale \- Scale DICOM images diff --git a/doxygen/manpages/man1/dcmsend.1 b/doxygen/manpages/man1/dcmsend.1 index 00fb79c7..586d8e43 100644 --- a/doxygen/manpages/man1/dcmsend.1 +++ b/doxygen/manpages/man1/dcmsend.1 @@ -1,4 +1,4 @@ -.TH "dcmsend" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmsend" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmsend \- Simple DICOM storage SCU (sender) diff --git a/doxygen/manpages/man1/dcmsign.1 b/doxygen/manpages/man1/dcmsign.1 index 09fdb931..f218466a 100644 --- a/doxygen/manpages/man1/dcmsign.1 +++ b/doxygen/manpages/man1/dcmsign.1 @@ -1,4 +1,4 @@ -.TH "dcmsign" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcmsign" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcmsign \- Sign and Verify DICOM Files diff --git a/doxygen/manpages/man1/dcod2lum.1 b/doxygen/manpages/man1/dcod2lum.1 index 00b0e2e6..ad1777a6 100644 --- a/doxygen/manpages/man1/dcod2lum.1 +++ b/doxygen/manpages/man1/dcod2lum.1 @@ -1,4 +1,4 @@ -.TH "dcod2lum" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dcod2lum" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dcod2lum \- Convert hardcopy characteristic curve file to softcopy format diff --git a/doxygen/manpages/man1/dconvlum.1 b/doxygen/manpages/man1/dconvlum.1 index a05b40fd..7c5e3f22 100644 --- a/doxygen/manpages/man1/dconvlum.1 +++ b/doxygen/manpages/man1/dconvlum.1 @@ -1,4 +1,4 @@ -.TH "dconvlum" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dconvlum" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dconvlum \- Convert VeriLUM files to DCMTK display files diff --git a/doxygen/manpages/man1/drtdump.1 b/doxygen/manpages/man1/drtdump.1 index a3770c5b..dba43015 100644 --- a/doxygen/manpages/man1/drtdump.1 +++ b/doxygen/manpages/man1/drtdump.1 @@ -1,4 +1,4 @@ -.TH "drtdump" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "drtdump" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME drtdump \- Dump DICOM RT file and data set diff --git a/doxygen/manpages/man1/dsr2html.1 b/doxygen/manpages/man1/dsr2html.1 index fe736cbf..25629347 100644 --- a/doxygen/manpages/man1/dsr2html.1 +++ b/doxygen/manpages/man1/dsr2html.1 @@ -1,4 +1,4 @@ -.TH "dsr2html" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dsr2html" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dsr2html \- Render DICOM SR file and data set to HTML/XHTML @@ -225,23 +225,25 @@ The \fBdsr2html\fP utility supports the following SOP Classes: .PP .PP .nf -SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 -MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 -BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 -EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 -ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 -Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 -ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 -MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 -KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 -ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 -XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 -RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 -ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 -ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 -AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 -SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 -PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 +MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 +BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 +EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 +ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 +Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 +ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 +MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 +KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 +ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 +XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 +RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 +ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 +ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 +AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 +SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 +PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 .fi .PP .SS "Character Encoding" @@ -297,4 +299,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBdcmconv\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2000-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2000-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/dsr2xml.1 b/doxygen/manpages/man1/dsr2xml.1 index 79e7b74b..78e23142 100644 --- a/doxygen/manpages/man1/dsr2xml.1 +++ b/doxygen/manpages/man1/dsr2xml.1 @@ -1,4 +1,4 @@ -.TH "dsr2xml" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dsr2xml" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dsr2xml \- Convert DICOM SR file and data set to XML @@ -189,23 +189,25 @@ The \fBdsr2xml\fP utility supports the following SOP Classes: .PP .PP .nf -SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 -MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 -BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 -EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 -ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 -Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 -ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 -MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 -KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 -ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 -XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 -RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 -ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 -ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 -AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 -SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 -PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 +MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 +BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 +EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 +ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 +Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 +ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 +MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 +KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 +ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 +XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 +RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 +ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 +ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 +AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 +SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 +PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 .fi .PP .PP @@ -238,6 +240,8 @@ Chinese "GBK" => "GBK" If this DICOM attribute is missing in the input file, although needed, option \fI--charset-assume\fP can be used to specify an appropriate character set manually (using one of the DICOM defined terms)\&. For reasons of backward compatibility with previous versions of this tool, the following terms are also supported and mapped automatically to the associated DICOM defined terms: latin-1, latin-2, latin-3, latin-4, latin-5, cyrillic, arabic, greek, hebrew\&. .PP Option \fI--convert-to-utf8\fP can be used to convert the DICOM file or data set to UTF-8 encoding prior to the conversion to XML format\&. +.PP +If no mapping is defined and option \fI--convert-to-utf8\fP is not used, non-ASCII characters and those below #32 are stored as '&#nnn;' where 'nnn' refers to the numeric character code\&. This might lead to invalid character entity references (such as '' for ESC) and will cause most XML parsers to reject the document\&. .SS "Error Handling" Please be careful with the processing options \fI--unknown-relationship\fP, \fI--invalid-item-value\fP, \fI--ignore-constraints\fP, \fI--ignore-item-errors\fP and \fI--skip-invalid-items\fP since they disable certain validation checks on the DICOM SR input file and, therefore, might result in non-standard conformant output\&. However, there might be reasons for using one or more of these options, e\&.g\&. in order to read and process an incorrectly encoded SR document\&. .SS "Limitations" @@ -267,4 +271,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBxml2dsr\fP(1), \fBdcmconv\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2000-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2000-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/dsrdump.1 b/doxygen/manpages/man1/dsrdump.1 index 48a74ec5..af537c33 100644 --- a/doxygen/manpages/man1/dsrdump.1 +++ b/doxygen/manpages/man1/dsrdump.1 @@ -1,4 +1,4 @@ -.TH "dsrdump" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dsrdump" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dsrdump \- Dump DICOM SR file and data set @@ -203,23 +203,25 @@ The \fBdsrdump\fP utility supports the following SOP Classes: .PP .PP .nf -SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 -MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 -BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 -EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 -ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 -Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 -ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 -MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 -KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 -ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 -XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 -RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 -ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 -ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 -AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 -SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 -PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 +MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 +BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 +EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 +ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 +Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 +ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 +MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 +KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 +ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 +XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 +RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 +ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 +ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 +AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 +SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 +PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 .fi .PP .SH "LOGGING" @@ -244,4 +246,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBdcmconv\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2000-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2000-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/dump2dcm.1 b/doxygen/manpages/man1/dump2dcm.1 index 50fc9d41..a36c4ad3 100644 --- a/doxygen/manpages/man1/dump2dcm.1 +++ b/doxygen/manpages/man1/dump2dcm.1 @@ -1,4 +1,4 @@ -.TH "dump2dcm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "dump2dcm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME dump2dcm \- Convert ASCII dump to DICOM file diff --git a/doxygen/manpages/man1/echoscu.1 b/doxygen/manpages/man1/echoscu.1 index c260be2e..e7445acd 100644 --- a/doxygen/manpages/man1/echoscu.1 +++ b/doxygen/manpages/man1/echoscu.1 @@ -1,4 +1,4 @@ -.TH "echoscu" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "echoscu" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME echoscu \- DICOM verification (C-ECHO) SCU @@ -145,6 +145,9 @@ security profile: +py --profile-bcp195-nd Non-downgrading BCP 195 TLS Profile + +pz --profile-bcp195-ex + Extended BCP 195 TLS Profile + +pb --profile-basic Basic TLS Secure Transport Connection Profile (retired) diff --git a/doxygen/manpages/man1/findscu.1 b/doxygen/manpages/man1/findscu.1 index f9b58c47..6a33dd57 100644 --- a/doxygen/manpages/man1/findscu.1 +++ b/doxygen/manpages/man1/findscu.1 @@ -1,4 +1,4 @@ -.TH "findscu" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "findscu" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME findscu \- DICOM query (C-FIND) SCU @@ -192,6 +192,9 @@ security profile: +py --profile-bcp195-nd Non-downgrading BCP 195 TLS Profile + +pz --profile-bcp195-ex + Extended BCP 195 TLS Profile + +pb --profile-basic Basic TLS Secure Transport Connection Profile (retired) @@ -312,7 +315,7 @@ If no file is specified on the command line, the query must be specified complet .PP Each set of response identifiers received will be output to the logger unless option \fI--hide-responses\fP, any of the below \fI--extract\fP variants, \fI--quiet\fP or an appropriate logger configuration is used\&. In such cases, the output to the logger can be enforced with option \fI--show-responses\fP\&. .PP -In addition, the response datasets can also be extracted as individual DICOM files (using option \fI--extract\fP) or XML files (using option \fI--extract-xml\fP)\&. The output format of the latter is described by the file \fIdcm2xml\&.dtd\fP (starting with top-level element 'data-set')\&. +In addition, the response datasets can also be extracted as individual DICOM files (using option \fI--extract\fP) or XML files (using option \fI--extract-xml\fP)\&. The output format of the latter is described by the file \fIdcm2xml\&.dtd\fP (starting with top-level element 'data-set')\&. For XML files, the Specific Character Set is mapped automatically to an appropriate XML encoding\&. If this is not possible, e\&.g\&. in case of ISO 2022 character sets, non-ASCII characters and those below #32 are stored as '&#nnn;' where 'nnn' refers to the numeric character code\&. Please note that this might lead to invalid character entity references (such as '' for ESC) and will cause most XML parsers to reject the document\&. .PP Alternatively, all response datasets of an association can be extracted to a single XML file using option \fI--extract-xml-single\fP\&. The top-level element of the XML document is 'responses' (with a 'type' attribute of 'C-FIND')\&. The individual datasets are stored as described above\&. If support for character set conversion is enabled, UTF-8 encoding is used, i\&.e\&. all datasets are converted to UTF-8 encoding (which is strongly recommended in order to avoid issues with non-ASCII characters when different character sets are used)\&. .SS "DICOM Conformance" @@ -368,4 +371,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBmovescu\fP(1), \fBdump2dcm\fP(1), \fBdcmodify\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 1994-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 1994-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/getscu.1 b/doxygen/manpages/man1/getscu.1 index e99404f0..b26f825d 100644 --- a/doxygen/manpages/man1/getscu.1 +++ b/doxygen/manpages/man1/getscu.1 @@ -1,4 +1,4 @@ -.TH "getscu" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "getscu" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME getscu \- DICOM retrieve (C-GET) SCU diff --git a/doxygen/manpages/man1/img2dcm.1 b/doxygen/manpages/man1/img2dcm.1 index a82f9d48..08908565 100644 --- a/doxygen/manpages/man1/img2dcm.1 +++ b/doxygen/manpages/man1/img2dcm.1 @@ -1,4 +1,4 @@ -.TH "img2dcm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "img2dcm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME img2dcm \- Convert standard image formats into DICOM format @@ -13,6 +13,8 @@ img2dcm [options] imgfile-in dcmfile-out .SH "DESCRIPTION" .PP The \fBimg2dcm\fP tool serves as a conversion tool from a standard image format like JPEG or BMP to DICOM\&. Different output SOP Classes can be selected\&. The additional information (regarding patients, series, etc\&.) stored in the DICOM output file can be extracted from other DICOM files which serve as a 'template' for the resulting DICOM object\&. \fBimg2dcm\fP can also be configured to invent missing DICOM type 1 and type 2 attributes to work even without any template dataset\&. +.PP +\fBimg2dcm\fP only supports single-frame output so far, i\&.e\&. it is not possible to create multi-frame objects\&. Thus, also output SOP Classes that potentially allow multiple frames within one object (such as the new Secondary Capture SOP Classes) can only be created containing a single frame\&. .SH "PARAMETERS" .PP .PP @@ -344,4 +346,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBdcm2pnm\fP(1), \fBdcmj2pnm\fP(1), \fBdump2dcm\fP(1), \fBdcmconv\fP(1), \fBdcmodify\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2007-2016 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2007-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/movescu.1 b/doxygen/manpages/man1/movescu.1 index 62dfb829..35ce957b 100644 --- a/doxygen/manpages/man1/movescu.1 +++ b/doxygen/manpages/man1/movescu.1 @@ -1,4 +1,4 @@ -.TH "movescu" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "movescu" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME movescu \- DICOM retrieve (C-MOVE) SCU @@ -523,6 +523,8 @@ ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88. AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1 EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1 EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2 @@ -542,6 +544,10 @@ RTBrachyTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481 RTTreatmentSummaryRecordStorage 1.2.840.10008.5.1.4.1.1.481.7 RTIonPlanStorage 1.2.840.10008.5.1.4.1.1.481.8 RTIonBeamsTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481.9 +RTPhysicianIntentStorage 1.2.840.10008.5.1.4.1.1.481.10 +RTSegmentAnnotationStorage 1.2.840.10008.5.1.4.1.1.481.11 +RTRadiationSetStorage 1.2.840.10008.5.1.4.1.1.481.12 +CArmPhotonElectronRadiationStorage 1.2.840.10008.5.1.4.1.1.481.13 DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501.1 DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1 DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2 @@ -664,4 +670,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBfindscu\fP(1), \fBstorescp\fP(1), \fBdump2dcm\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 1994-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 1994-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/pdf2dcm.1 b/doxygen/manpages/man1/pdf2dcm.1 index 693e663b..9459d2ad 100644 --- a/doxygen/manpages/man1/pdf2dcm.1 +++ b/doxygen/manpages/man1/pdf2dcm.1 @@ -1,4 +1,4 @@ -.TH "pdf2dcm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "pdf2dcm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME pdf2dcm \- Encapsulate PDF file into DICOM file format diff --git a/doxygen/manpages/man1/stl2dcm.1 b/doxygen/manpages/man1/stl2dcm.1 index d34fb671..eab5b865 100644 --- a/doxygen/manpages/man1/stl2dcm.1 +++ b/doxygen/manpages/man1/stl2dcm.1 @@ -1,4 +1,4 @@ -.TH "stl2dcm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "stl2dcm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME stl2dcm \- Encapsulate STL file into DICOM file format diff --git a/doxygen/manpages/man1/storescp.1 b/doxygen/manpages/man1/storescp.1 index 880f41ba..34430af0 100644 --- a/doxygen/manpages/man1/storescp.1 +++ b/doxygen/manpages/man1/storescp.1 @@ -1,4 +1,4 @@ -.TH "storescp" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "storescp" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME storescp \- DICOM storage (C-STORE) SCP @@ -253,6 +253,9 @@ security profile: +py --profile-bcp195-nd Non-downgrading BCP 195 TLS Profile + +pz --profile-bcp195-ex + Extended BCP 195 TLS Profile + +pb --profile-basic Basic TLS Secure Transport Connection Profile (retired) @@ -643,9 +646,12 @@ ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88. AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1 EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1 EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2 +EncapsulatedSTLStorage 1.2.840.10008.5.1.4.1.1.104.3 PositronEmissionTomographyImageStorage 1.2.840.10008.5.1.4.1.1.128 LegacyConvertedEnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.128.1 RETIRED_StandalonePETCurveStorage 1.2.840.10008.5.1.4.1.1.129 @@ -661,6 +667,10 @@ RTBrachyTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481 RTTreatmentSummaryRecordStorage 1.2.840.10008.5.1.4.1.1.481.7 RTIonPlanStorage 1.2.840.10008.5.1.4.1.1.481.8 RTIonBeamsTreatmentRecordStorage 1.2.840.10008.5.1.4.1.1.481.9 +RTPhysicianIntentStorage 1.2.840.10008.5.1.4.1.1.481.10 +RTSegmentAnnotationStorage 1.2.840.10008.5.1.4.1.1.481.11 +RTRadiationSetStorage 1.2.840.10008.5.1.4.1.1.481.12 +CArmPhotonElectronRadiationStorage 1.2.840.10008.5.1.4.1.1.481.13 DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501.1 DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1 DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2 @@ -761,4 +771,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBstorescu\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 1996-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 1996-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/storescu.1 b/doxygen/manpages/man1/storescu.1 index 4d23777d..64d9698b 100644 --- a/doxygen/manpages/man1/storescu.1 +++ b/doxygen/manpages/man1/storescu.1 @@ -1,4 +1,4 @@ -.TH "storescu" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "storescu" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME storescu \- DICOM storage (C-STORE) SCU @@ -87,6 +87,12 @@ input files: +r --recurse recurse within specified directories + + -rn --no-rename + do not rename processed files (default) + + +rn --rename + append .done/.bad to processed files .fi .PP .SS "network options" @@ -329,6 +335,9 @@ security profile: +py --profile-bcp195-nd Non-downgrading BCP 195 TLS Profile + +pz --profile-bcp195-ex + Extended BCP 195 TLS Profile + +pb --profile-basic Basic TLS Secure Transport Connection Profile (retired) @@ -504,4 +513,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBstorescp\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 1996-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 1996-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/termscu.1 b/doxygen/manpages/man1/termscu.1 index 487f4655..5b132adf 100644 --- a/doxygen/manpages/man1/termscu.1 +++ b/doxygen/manpages/man1/termscu.1 @@ -1,4 +1,4 @@ -.TH "termscu" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "termscu" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME termscu \- DICOM termination SCU diff --git a/doxygen/manpages/man1/wlmscpfs.1 b/doxygen/manpages/man1/wlmscpfs.1 index 758e430e..a7120931 100644 --- a/doxygen/manpages/man1/wlmscpfs.1 +++ b/doxygen/manpages/man1/wlmscpfs.1 @@ -1,4 +1,4 @@ -.TH "wlmscpfs" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "wlmscpfs" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME wlmscpfs \- DICOM Basic Worklist Management SCP (based on data files) @@ -97,6 +97,12 @@ other processing options: -nse --no-sq-expansion disable expansion of empty sequences in C-FIND request messages + + -rfp --request-file-path [p]ath: string + path to store request files to + + -rff --request-file-format [f]ormat: string (default: #t.dump) + request file name format .fi .PP .SS "network options" @@ -160,6 +166,9 @@ other network options: --no-fail don't fail on an invalid query + --sleep-before [s]econds: integer + sleep s seconds before find (default: 0) + --sleep-after [s]econds: integer sleep s seconds after find (default: 0) @@ -184,6 +193,49 @@ In general, the Specific Character Set attribute (0008,0005) will only be includ Please note that a C-FIND request which is handled by this application may contain DICOM's Specific Character Set attribute (0008,0005), but this application will never use this attribute's value for matching\&. Besides, the question if DICOM's Specific Character Set attribute (0008,0005) will be contained in a C-FIND response which is returned by this application is always determined by the returned character set option which was specified when this application was started\&. .PP The options --enable-file-reject and --disable-file-reject can be used to enable or disable a file rejection mechanism which makes sure only complete worklist files will be used during the matching process\&. A worklist file is considered to be complete if it contains all necessary type 1 information which the SCP might have to return to an SCU in a C-FIND response message\&. Table K\&.6-1 in part 4 annex K of the DICOM standard lists all corresponding type 1 attributes (see column 'Return Key Type')\&. +.SS "Writing Request Files" +Providing option \fI--request-file-path\fP enables writing of the incoming C-FIND requests into text files\&. The option value provides the target directory where these files will be stored\&. All request files are stored in 'dump' format as provided by the \fBdcmdump\fP tool and are raw, i\&.e\&. they are written as they arrive at \fBwlmscpfs\fP, without any tag processing applied by \fBwlmscpfs\fP\&. +.PP +Writing request files allows users to 'interactively' prepare the worklist database (for \fBwlmscpfs\fP the worklist files served from the \fI--data-file-path\fP directory) by watching the request file directory\&. Once a request file appears, one needs some time to update worklist entries in the database\&. For that reason it makes sense to use \fI--request-file-path\fP in combination with option \fI--sleep-before\fP which lets users specify a certain amount of seconds that \fBwlmscpfs\fP should wait before actually starting to check the worklist database\&. Note that the request files written with \fI--data-file-path\fP are not automatically deleted by \fBwlmscpfs\fP\&. +.PP +If request files are enabled, \fBwlmscpfs\fP must automatically create file names within the given directory\&. By default, the format is \&.dump where is in the format YYYYMMDDhhmmssffffff where: +.IP "\(bu" 2 +YYYY is the current year +.IP "\(bu" 2 +MM is the current month +.IP "\(bu" 2 +DD is the current day +.IP "\(bu" 2 +hh are the current hours (in 24 hour format) +.IP "\(bu" 2 +mm are the current minutes +.IP "\(bu" 2 +ss are the current seconds and +.IP "\(bu" 2 +ffffff is the fraction of the current second +.PP +.PP +This should work as a default for most applications that would like to use request files and want to ensure unique file names\&. If it is desired to change this naming scheme, the option \fI--request-file-format\fP can be used\&. It permits to specify the file naming pattern used by \fI--request-file-path\fP\&. +.PP +For flexibility, the following placeholders can be used in the pattern provided for \fI--request-file-format\fP: +.PP +.IP "\(bu" 2 +#a: calling application entity title of the peer SCU +.IP "\(bu" 2 +#c: called application entity title (AE title of worklist SCP application) +.IP "\(bu" 2 +#i: process id of the worklist SCP application process handling the request +.IP "\(bu" 2 +#p: patient ID if present, otherwise empty string +.IP "\(bu" 2 +#t: timestamp in the format YYYYMMDDhhmmssffffff +.PP +.PP +The default (i\&.e\&. the value if \fI--request-file-format\fP is not explicitly set) is #t\&.dump resulting in the timestamp format described above\&. +.PP +An example for such a user-defined format string would be 'request_#i_#a_#c\&.txt'\&. The #i makes most sense if \fBwlmscpfs\fP multi-process mode is enabled via \fI--fork\fP option in order to ensure that simultaneous request will not result in the same file name for both requests\&. +.PP +It should be noted that the #p placeholder uses the value of Patient ID (0010,0020) from the request as is, i\&.e\&. if the string contains non-ASCII characters, the file name computed by \fBwlmscpfs\fP might be broken and thus cannot be written successfully or will look broken once written\&. Also, an empty Patient ID is used as such, i\&.e\&. the #p will be replaced with an empty string\&. .SS "DICOM Conformance" The \fBwlmscpfs\fP application supports the following SOP Classes as an SCP: .PP @@ -361,4 +413,4 @@ The \fBwlmscpfs\fP utility will attempt to load DICOM data dictionaries specifie The default behavior should be preferred and the \fIDCMDICTPATH\fP environment variable only used when alternative data dictionaries are required\&. The \fIDCMDICTPATH\fP environment variable has the same format as the Unix shell \fIPATH\fP variable in that a colon (':') separates entries\&. On Windows systems, a semicolon (';') is used as a separator\&. The data dictionary code will attempt to load each file specified in the \fIDCMDICTPATH\fP environment variable\&. It is an error if no data dictionary can be loaded\&. .SH "COPYRIGHT" .PP -Copyright (C) 1996-2017 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 1996-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/xml2dcm.1 b/doxygen/manpages/man1/xml2dcm.1 index 3262ed06..944114f0 100644 --- a/doxygen/manpages/man1/xml2dcm.1 +++ b/doxygen/manpages/man1/xml2dcm.1 @@ -1,4 +1,4 @@ -.TH "xml2dcm" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "xml2dcm" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME xml2dcm \- Convert XML document to DICOM file or data set @@ -233,7 +233,7 @@ Multiple character sets are not supported (only the first value of the 'Specific .PP See \fBdcm2xml\fP documentation for more details on the XML structure\&. .SS "Binary Data" -Binary data can be encoded either as a sequence of hex numbers separated by a backslash '\\' or in Base64 format (binary='base64')\&. In addition, binary data can also be read from file (binary='file')\&. In this case, the filename has to be specified as the element value, e\&.g\&. +Binary data (*) can be encoded either as a sequence of hex numbers separated by a backslash '\\' or in Base64 format (binary='base64')\&. In addition, binary data can also be read from file (binary='file')\&. In this case, the filename has to be specified as the element value, e\&.g\&. .PP .PP .nf @@ -242,6 +242,8 @@ Binary data can be encoded either as a sequence of hex numbers separated by a ba .PP .PP Please note that the contents of the file will be read as is\&. OW data is expected to be little endian ordered and will be swapped if necessary\&. No checks will be made to ensure that the amount of data is reasonable in terms of other attributes such as Rows or Columns\&. +.PP +(*) Please note that currently only OB and OW data is supported, i\&.e\&. element values with a VR of OD, OF, OL and OV are not regarded as 'binary data' and treated as all other VRs\&. .SS "Compression" If libxml is compiled with zlib support, the input file (\fIxmlfile-in\fP) can also be compressed with ZIP, which usually results in much smaller files\&. See output of option \fI--version\fP in order to check whether zlib support is available\&. .SS "Limitations" @@ -273,4 +275,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBdcm2xml\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2003-2014 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2003-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/manpages/man1/xml2dsr.1 b/doxygen/manpages/man1/xml2dsr.1 index b9fb4c33..1b008c35 100644 --- a/doxygen/manpages/man1/xml2dsr.1 +++ b/doxygen/manpages/man1/xml2dsr.1 @@ -1,7 +1,7 @@ -.TH "xml2dsr" 1 "Thu Nov 29 2018" "Version 3.6.4" "OFFIS DCMTK" \" -*- nroff -*- +.TH "xml2dsr" 1 "Mon Oct 28 2019" "Version 3.6.5" "OFFIS DCMTK" \" -*- nroff -*- .nh .SH NAME -xml2dsr \- Convert DICOM SR file and data set to XML +xml2dsr \- Convert XML document to DICOM SR file .SH "SYNOPSIS" .PP @@ -170,23 +170,25 @@ The \fBxml2dsr\fP utility supports the following SOP Classes: .PP .PP .nf -SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 -MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 -BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 -EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 -ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 -Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 -ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 -MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 -KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 -ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 -XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 -RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 -ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 -ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 -AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 -SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 -PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +SpectaclePrescriptionReportStorage 1.2.840.10008.5.1.4.1.1.78.6 +MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1 +BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.11 +EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22 +ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33 +Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34 +ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40 +MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50 +KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59 +ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65 +XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67 +RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68 +ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69 +ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70 +AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71 +SimplifiedAdultEchoSRStorage 1.2.840.10008.5.1.4.1.1.88.72 +PatientRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.73 +PlannedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.74 +PerformedImagingAgentAdministrationSRStorage 1.2.840.10008.5.1.4.1.1.88.75 .fi .PP .PP @@ -246,4 +248,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v \fBdsr2xml\fP(1) .SH "COPYRIGHT" .PP -Copyright (C) 2003-2018 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. +Copyright (C) 2003-2019 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&. diff --git a/doxygen/patchman.cmake b/doxygen/patchman.cmake new file mode 100644 index 00000000..4bbefc34 --- /dev/null +++ b/doxygen/patchman.cmake @@ -0,0 +1,21 @@ +# +# Copyright (C) 2019, Jan Schlamelcher, OFFIS e.V. +# All rights reserved. See COPYRIGHT file for details. +# +# Purpose: Fix some details in Doxygen generated manpages that can not be +# configured via Doxygen itself directly. +# + +file(GLOB MANPAGES "${CMAKE_CURRENT_BINARY_DIR}/manpages/man1/*.1") +foreach(MANPAGE ${MANPAGES}) + if(MANPAGE MATCHES "[.]man[.]1$" OR MANPAGE MATCHES "_([^/]*)_[.]1$") + # The file is some Doxygen generated manpage index that we don't want. + file(REMOVE "${MANPAGE}") + else() + # The file is a useful manpage, but it might contain a ".ad l" statement + # at the beginning that messes with text justification. + file(READ "${MANPAGE}" CONTENT) + string(REGEX REPLACE "(\r|\n|\r\n)[.]ad l" "" CONTENT "${CONTENT}") + file(WRITE "${MANPAGE}" "${CONTENT}") + endif() +endforeach() diff --git a/oflog/include/dcmtk/oflog/layout.h b/oflog/include/dcmtk/oflog/layout.h index b4ae7777..1451848e 100644 --- a/oflog/include/dcmtk/oflog/layout.h +++ b/oflog/include/dcmtk/oflog/layout.h @@ -48,7 +48,7 @@ namespace log4cplus { } - + namespace helpers { @@ -77,12 +77,12 @@ namespace log4cplus { Layout(const helpers::Properties& properties); virtual ~Layout() = 0; - virtual void formatAndAppend(log4cplus::tostream& output, + virtual void formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event) = 0; protected: LogLevelManager& llmCache; - + private: // Disable copy Layout(const Layout&); @@ -109,10 +109,10 @@ namespace log4cplus { SimpleLayout(const log4cplus::helpers::Properties& properties); virtual ~SimpleLayout(); - virtual void formatAndAppend(log4cplus::tostream& output, + virtual void formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event); - private: + private: // Disallow copying of instances of this class SimpleLayout(const SimpleLayout&); SimpleLayout& operator=(const SimpleLayout&); @@ -123,13 +123,13 @@ namespace log4cplus { /** * TTCC layout format consists of time, thread, Logger and nested * diagnostic context information, hence the name. - * + * * The time format depends on the DateFormat used. Use the * Use_gmtime to specify whether messages should be logged using * localtime or gmtime. - * + * * Here is an example TTCCLayout output: - * + * * 
      * 176 [main] INFO  org.apache.log4j.examples.Sort - Populating an array of 2 elements in reverse order.
      * 225 [main] INFO  org.apache.log4j.examples.SortAlgo - Entered the sort method.
@@ -143,17 +143,17 @@ namespace log4cplus {
      * 346 [main] ERROR org.apache.log4j.examples.SortAlgo.DUMP - Tried to dump an uninitialized array.
      * 467 [main] INFO  org.apache.log4j.examples.Sort - Exiting main method.
      *
- * + * * The first field is the number of milliseconds elapsed since the * start of the program. The second field is the thread outputting the * log statement. The third field is the LogLevel, the fourth field is * the logger to which the statement belongs. - * + * * The fifth field (just before the '-') is the nested diagnostic * context. Note the nested diagnostic context may be empty as in the * first two statements. The text after the '-' is the message of the * statement. - * + * * PatternLayout offers a much more flexible alternative. */ class DCMTK_LOG4CPLUS_EXPORT TTCCLayout @@ -165,14 +165,14 @@ namespace log4cplus { TTCCLayout(const log4cplus::helpers::Properties& properties); virtual ~TTCCLayout(); - virtual void formatAndAppend(log4cplus::tostream& output, + virtual void formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event); protected: log4cplus::tstring dateFormat; bool use_gmtime; - - private: + + private: // Disallow copying of instances of this class TTCCLayout(const TTCCLayout&); TTCCLayout& operator=(const TTCCLayout&); @@ -184,26 +184,26 @@ namespace log4cplus { /** * A flexible layout configurable with pattern string. - * - * The goal of this class is to format a InternalLoggingEvent and return - * the results as a string. The results depend on the conversion + * + * The goal of this class is to format a InternalLoggingEvent and return + * the results as a string. The results depend on the conversion * pattern. - * + * * The conversion pattern is closely related to the conversion * pattern of the printf function in C. A conversion pattern is * composed of literal text and format control expressions called * conversion specifiers. - * + * * You are free to insert any literal text within the conversion * pattern. - * + * * Each conversion specifier starts with a percent sign (%%) and is * followed by optional format modifiers and a conversion * character. The conversion character specifies the type of * data, e.g. Logger, LogLevel, date, thread name. The format * modifiers control such things as field width, padding, left and * right justification. The following is a simple example. - * + * * Let the conversion pattern be "%-5p [%t]: %m%n" and assume * that the log4cplus environment was set to use a PatternLayout. Then the * statements @@ -215,19 +215,19 @@ namespace log4cplus { * would yield the output * 
      * DEBUG [main]: Message 1
-     * WARN  [main]: Message 2  
+     * WARN  [main]: Message 2
      *
- * + * * Note that there is no explicit separator between text and * conversion specifiers. The pattern parser knows when it has reached * the end of a conversion specifier when it reads a conversion * character. In the example above the conversion specifier * "%-5p" means the LogLevel of the logging event should be left * justified to a width of five characters. - * + * * The recognized conversion characters are - * - * + * + * * * * @@ -243,30 +243,30 @@ namespace log4cplus { * * * - * + * * * - * - * - * * - * + * + * + * * - * - * - * + * + * + * * * * - * + * * + * + * * - * - * - * + * + * + * * * * - * - * - * + * + * + * * * * - * + * * * - * + * * * - * + * * * - * + * * * * * * - * + * * * * @@ -388,14 +391,14 @@ namespace log4cplus { * DCMTK_LOG4CPLUS_DISABLE_FUNCTION_MACRO macro, %M * expands to an empty string. * - * + * * * - * + * * * - * + * * * * @@ -403,27 +406,30 @@ namespace log4cplus { * * * + * * + * + * NOTE: This pattern has been added to log4cplus. + * * * * * + * * * - * + * * * - * + * * * * * * - * + * * * @@ -437,27 +443,26 @@ namespace log4cplus { * * * - * + * * + * with the thread that generated the logging event. * * * * - * + * + * * - * + * *
Conversion Character
cUsed to output the logger of the logging event. The * logger conversion specifier can be optionally followed by * precision specifier, that is a decimal constant in * brackets. - * + * * If a precision specifier is given, then only the corresponding * number of right most components of the logger name will be * printed. By default the logger name is printed in full. - * + * * For example, for the logger name "a.b.c" the pattern * %c{2} will output "b.c". - * + * *
dUsed to output the date of the logging event in UTC. + *
dUsed to output the date of the logging event in UTC. * * The date conversion specifier may be followed by a date format * specifier enclosed between braces. For example, %%d{%%H:%%M:%%s} - * or %%d{%%d %%b %%Y %%H:%%M:%%s}. If no date format + * or %%d{%%d %%b %%Y %%H:%%M:%%s}. If no date format * specifier is given then %%d{%%d %%m %%Y %%H:%%M:%%s} * is assumed. * @@ -302,9 +302,9 @@ namespace log4cplus { * found in the <ctime> header for more information. *
D
DUsed to output the date of the logging event in local time. * @@ -314,16 +314,18 @@ namespace log4cplus { * *
FUsed to output the file name where the logging request was * issued. - * + * * NOTE Unlike log4j, there is no performance penalty for * calling this method.
h
hUsed to output the hostname of this system (as returned * by gethostname(2)). @@ -333,9 +335,9 @@ namespace log4cplus { * *
H
HUsed to output the fully-qualified domain name of this * system (as returned by gethostbyname(2) for the hostname @@ -346,33 +348,34 @@ namespace log4cplus { * *
lEquivalent to using "%F:%L" - * + * * NOTE: Unlike log4j, there is no performance penalty for * calling this method. - * + * *
LUsed to output the line number from where the logging request * was issued. - * + * * NOTE: Unlike log4j, there is no performance penalty for * calling this method. - * + * + *
mUsed to output the application supplied message associated with - * the logging event.Used to output the application supplied message associated with + * the logging event.
nOutputs the platform dependent line separator character or - * characters. + * characters.
pUsed to output the LogLevel of the logging event.
PUsed to output the first character of the LogLevel of the logging event. - * NOTE: This pattern has been added to log4cplus. - *
rUsed to output miliseconds since program start * of the logging event.
tUsed to output the name of the thread that generated the * logging event.
TUsed to output alternative name of the thread that generated the * logging event.
xUsed to output the NDC (nested diagnostic context) associated - * with the thread that generated the logging event. - *
"%%"The sequence "%%" outputs a single percent sign. - * The sequence "%%" outputs a single percent sign.
- * + * * By default the relevant information is output as is. However, * with the aid of format modifiers it is possible to change the * minimum field width, the maximum field width and justification. - * + * * The optional format modifier is placed between the percent sign * and the conversion character. - * + * * The first optional format modifier is the left justification * flag which is just the minus (-) character. Then comes the * optional minimum field width modifier. This is a decimal @@ -469,7 +474,7 @@ namespace log4cplus { * padding character is space. If the data item is larger than the * minimum field width, the field is expanded to accommodate the * data. The value is never truncated. - * + * * This behavior can be changed using the maximum field * width modifier which is designated by a period followed by a * decimal constant. If the data item is longer than the maximum @@ -479,11 +484,11 @@ namespace log4cplus { * ten characters long, then the first two characters of the data item * are dropped. This behavior deviates from the printf function in C * where truncation is done from the end. - * + * * Below are various format modifier examples for the logger * conversion specifier. - * - * + * + * * * * @@ -498,67 +503,67 @@ namespace log4cplus { * * * - * + * * - * + * * - * + * * * * * * - * + * * - * + * * * * * * - * + * * - * + * * * * * * - * + * * - * + * *
Format modifierfalse20noneLeft pad with spaces if the logger name is less than 20 * characters long. *
%-20c true 20 none Right pad with * spaces if the logger name is less than 20 characters long. *
%.30cNAnone30Truncate from the beginning if the logger name is longer than 30 * characters. *
%20.30cfalse2030Left pad with spaces if the logger name is shorter than 20 * characters. However, if logger name is longer than 30 characters, - * then truncate from the beginning. + * then truncate from the beginning. *
%-20.30ctrue2030Right pad with spaces if the logger name is shorter than 20 * characters. However, if logger name is longer than 30 characters, - * then truncate from the beginning. + * then truncate from the beginning. *
- * + * * Below are some examples of conversion patterns. - * + * *
- * - *
"%r [%t] %-5p %c %x - %m%n" + * + *
"%r [%t] %-5p %c %x - %m%n" *
This is essentially the TTCC layout. - * + * *
"%-6r [%15.15t] %-5p %30.30c %x - %m%n" - * + * *
Similar to the TTCC layout except that the relative time is * right padded if less than 6 digits, thread name is right padded if * less than 15 characters and truncated if longer and the logger * name is left padded if shorter than 30 characters and truncated if * longer. - * + * *
- * + * * The above text is largely inspired from Peter A. Darnell and * Philip E. Margolis' highly recommended book "C -- a Software * Engineering Approach", ISBN 0-387-97389-3. @@ -572,7 +577,7 @@ namespace log4cplus { PatternLayout(const log4cplus::helpers::Properties& properties); virtual ~PatternLayout(); - virtual void formatAndAppend(log4cplus::tostream& output, + virtual void formatAndAppend(log4cplus::tostream& output, const log4cplus::spi::InternalLoggingEvent& event); protected: @@ -583,7 +588,7 @@ namespace log4cplus { bool formatEachLine; OFVector parsedPattern; - private: + private: // Disallow copying of instances of this class PatternLayout(const PatternLayout&); PatternLayout& operator=(const PatternLayout&); diff --git a/oflog/include/dcmtk/oflog/oflog.h b/oflog/include/dcmtk/oflog/oflog.h index 312e033b..2b37c25b 100644 --- a/oflog/include/dcmtk/oflog/oflog.h +++ b/oflog/include/dcmtk/oflog/oflog.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2009-2017, OFFIS e.V. + * Copyright (C) 2009-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -27,9 +27,6 @@ #include "dcmtk/oflog/logger.h" #include "dcmtk/oflog/logmacro.h" -#include "dcmtk/ofstd/oftypes.h" -#include "dcmtk/ofstd/ofmem.h" -#include "dcmtk/ofstd/ofconapp.h" #define OFLOG_TRACE(logger, msg) DCMTK_LOG4CPLUS_TRACE(logger, msg) #define OFLOG_DEBUG(logger, msg) DCMTK_LOG4CPLUS_DEBUG(logger, msg) @@ -38,6 +35,9 @@ #define OFLOG_ERROR(logger, msg) DCMTK_LOG4CPLUS_ERROR(logger, msg) #define OFLOG_FATAL(logger, msg) DCMTK_LOG4CPLUS_FATAL(logger, msg) +class OFCommandLine; +class OFConsoleApplication; + /** simple wrapper around the "low-level" Logger object to make it easier to * switch to a different system */ diff --git a/oflog/include/dcmtk/oflog/thread/impl/tls.h b/oflog/include/dcmtk/oflog/thread/impl/tls.h index ae30f33f..73718ad7 100644 --- a/oflog/include/dcmtk/oflog/thread/impl/tls.h +++ b/oflog/include/dcmtk/oflog/thread/impl/tls.h @@ -1,16 +1,16 @@ // -*- C++ -*- // Copyright (C) 2010, Vaclav Haisman. All rights reserved. -// +// // Redistribution and use in source and binary forms, with or without modifica- // tion, are permitted provided that the following conditions are met: -// +// // 1. Redistributions of source code must retain the above copyright notice, // this list of conditions and the following disclaimer. -// +// // 2. Redistributions in binary form must reproduce the above copyright notice, // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. -// +// // THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND // FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -69,13 +69,14 @@ typedef size_t tls_key_type; #endif -inline tls_key_type tls_init (tls_init_cleanup_func_type); inline tls_value_type tls_get_value (tls_key_type); inline void tls_set_value (tls_key_type, tls_value_type); inline void tls_cleanup (tls_key_type); - #if defined (DCMTK_LOG4CPLUS_USE_PTHREADS) + +inline tls_key_type tls_init (tls_init_cleanup_func_type); + tls_key_type tls_init (tls_init_cleanup_func_type cleanupfunc) { @@ -108,36 +109,62 @@ tls_cleanup (tls_key_type key) #elif defined (DCMTK_LOG4CPLUS_USE_WIN32_THREADS) + +#ifdef DCMTK_LOG4CPLUS_AVOID_WIN32_FLS +inline tls_key_type tls_init (tls_init_cleanup_func_type); + tls_key_type tls_init (tls_init_cleanup_func_type) { - return TlsAlloc (); + return TlsAlloc(); } +#else +inline tls_key_type tls_init (PFLS_CALLBACK_FUNCTION); + +tls_key_type +tls_init (PFLS_CALLBACK_FUNCTION cleanupfunc) +{ + return FlsAlloc(cleanupfunc); +} +#endif tls_value_type tls_get_value (tls_key_type k) { - return TlsGetValue (k); +#ifdef DCMTK_LOG4CPLUS_AVOID_WIN32_FLS + return TlsGetValue(k); +#else + return FlsGetValue(k); +#endif } void tls_set_value (tls_key_type k, tls_value_type value) { - TlsSetValue (k, value); +#ifdef DCMTK_LOG4CPLUS_AVOID_WIN32_FLS + TlsSetValue(k, value); +#else + FlsSetValue(k, value); +#endif } void tls_cleanup (tls_key_type k) { - TlsFree (k); +#ifdef DCMTK_LOG4CPLUS_AVOID_WIN32_FLS + TlsFree(k); +#else + FlsFree(k); +#endif } #elif defined (DCMTK_LOG4CPLUS_SINGLE_THREADED) extern OFVector * tls_single_threaded_values; +inline tls_key_type tls_init (tls_init_cleanup_func_type); tls_key_type tls_init (tls_init_cleanup_func_type) diff --git a/oflog/libsrc/Makefile.dep b/oflog/libsrc/Makefile.dep index fa27a7fe..4150adc1 100644 --- a/oflog/libsrc/Makefile.dep +++ b/oflog/libsrc/Makefile.dep @@ -925,31 +925,25 @@ objreg.o: objreg.cc ../include/dcmtk/oflog/spi/objreg.h \ ../include/dcmtk/oflog/thread/threads.h \ ../include/dcmtk/oflog/helpers/pointer.h oflog.o: oflog.cc ../../config/include/dcmtk/config/osconfig.h \ - ../../ofstd/include/dcmtk/ofstd/ofstd.h \ - ../../ofstd/include/dcmtk/ofstd/oflist.h \ - ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../include/dcmtk/oflog/oflog.h ../include/dcmtk/oflog/logger.h \ + ../include/dcmtk/oflog/config.h \ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \ ../../ofstd/include/dcmtk/ofstd/ofcast.h \ ../../ofstd/include/dcmtk/ofstd/ofexport.h \ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \ - ../../ofstd/include/dcmtk/ofstd/ofstream.h \ - ../../ofstd/include/dcmtk/ofstd/ofstring.h \ - ../../ofstd/include/dcmtk/ofstd/oftraits.h \ - ../../ofstd/include/dcmtk/ofstd/ofcond.h \ - ../../ofstd/include/dcmtk/ofstd/oflimits.h \ - ../../config/include/dcmtk/config/arith.h \ - ../../ofstd/include/dcmtk/ofstd/oferror.h \ - ../../ofstd/include/dcmtk/ofstd/ofdate.h \ - ../../ofstd/include/dcmtk/ofstd/oftime.h ../include/dcmtk/oflog/oflog.h \ - ../include/dcmtk/oflog/logger.h ../include/dcmtk/oflog/config.h \ ../include/dcmtk/oflog/config/defines.h \ ../include/dcmtk/oflog/helpers/threadcf.h \ ../include/dcmtk/oflog/loglevel.h \ ../../ofstd/include/dcmtk/ofstd/ofvector.h \ - ../include/dcmtk/oflog/tstring.h ../include/dcmtk/oflog/tchar.h \ - ../include/dcmtk/oflog/spi/apndatch.h ../include/dcmtk/oflog/appender.h \ + ../../ofstd/include/dcmtk/ofstd/oftypes.h \ + ../../ofstd/include/dcmtk/ofstd/ofstream.h \ + ../include/dcmtk/oflog/tstring.h \ + ../../ofstd/include/dcmtk/ofstd/ofstring.h \ + ../include/dcmtk/oflog/tchar.h ../include/dcmtk/oflog/spi/apndatch.h \ + ../include/dcmtk/oflog/appender.h \ ../../ofstd/include/dcmtk/ofstd/ofmem.h \ ../../ofstd/include/dcmtk/ofstd/ofutil.h \ + ../../ofstd/include/dcmtk/ofstd/oftraits.h \ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \ ../include/dcmtk/oflog/layout.h ../include/dcmtk/oflog/streams.h \ ../include/dcmtk/oflog/helpers/pointer.h \ @@ -959,6 +953,14 @@ oflog.o: oflog.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/oflog/spi/logfact.h ../include/dcmtk/oflog/logmacro.h \ ../include/dcmtk/oflog/helpers/snprintf.h \ ../include/dcmtk/oflog/tracelog.h \ + ../../ofstd/include/dcmtk/ofstd/ofstd.h \ + ../../ofstd/include/dcmtk/ofstd/oflist.h \ + ../../ofstd/include/dcmtk/ofstd/ofcond.h \ + ../../ofstd/include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../../ofstd/include/dcmtk/ofstd/oferror.h \ + ../../ofstd/include/dcmtk/ofstd/ofdate.h \ + ../../ofstd/include/dcmtk/ofstd/oftime.h \ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \ diff --git a/oflog/libsrc/globinit.cc b/oflog/libsrc/globinit.cc index dcb7b2e9..8227e532 100644 --- a/oflog/libsrc/globinit.cc +++ b/oflog/libsrc/globinit.cc @@ -342,6 +342,19 @@ alloc_ptd () void initializeFactoryRegistry(); +#ifdef DCMTK_LOG4CPLUS_USE_WIN32_THREADS + +//! Thread local storage clean up function for WIN32 threads. +static +void WINAPI +ptd_cleanup_func_win32(void * /* arg */ ) +{ + threadCleanup(); +} + +#endif + + //! Thread local storage clean up function for POSIX threads. static void @@ -405,7 +418,11 @@ void initializeLog4cplus() if (initialized) return; - internal::tls_storage_key = thread::impl::tls_init (ptd_cleanup_func); +#ifdef DCMTK_LOG4CPLUS_USE_WIN32_THREADS + internal::tls_storage_key = thread::impl::tls_init(ptd_cleanup_func_win32); +#else + internal::tls_storage_key = thread::impl::tls_init(ptd_cleanup_func); +#endif threadSetup (); DefaultContext * dc = get_dc (true); diff --git a/oflog/libsrc/oflog.cc b/oflog/libsrc/oflog.cc index 753c74de..fa91f4cf 100644 --- a/oflog/libsrc/oflog.cc +++ b/oflog/libsrc/oflog.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2009-2017, OFFIS e.V. + * Copyright (C) 2009-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -20,12 +20,13 @@ */ #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */ +#include "dcmtk/oflog/oflog.h" #include "dcmtk/ofstd/ofstd.h" #include "dcmtk/ofstd/ofdate.h" #include "dcmtk/ofstd/oftime.h" +#include "dcmtk/ofstd/ofconapp.h" -#include "dcmtk/oflog/oflog.h" #include "dcmtk/oflog/configrt.h" #include "dcmtk/oflog/consap.h" #include "dcmtk/oflog/helpers/loglog.h" diff --git a/oflog/libsrc/threads.cc b/oflog/libsrc/threads.cc index f9bf113b..3cb09716 100644 --- a/oflog/libsrc/threads.cc +++ b/oflog/libsrc/threads.cc @@ -45,7 +45,7 @@ # include # include #elif defined (DCMTK_LOG4CPLUS_USE_WIN32_THREADS) -# include +# include #endif #include "dcmtk/oflog/config/windowsh.h" #include "dcmtk/oflog/thread/syncpub.h" @@ -79,7 +79,7 @@ blockAllSignals() sigset_t signal_set; sigfillset (&signal_set); pthread_sigmask (SIG_BLOCK, &signal_set, 0); -#endif +#endif } @@ -119,10 +119,11 @@ getCurrentThreadName() } +#ifndef DCMTK_LOG4CPLUS_SINGLE_THREADED + namespace { - static bool get_current_thread_name_alt (log4cplus::tostream * s) @@ -137,7 +138,7 @@ get_current_thread_name_alt (log4cplus::tostream * s) #elif defined (__CYGWIN__) unsigned long tid = cygwin::get_current_win32_thread_id (); os << tid; - + #else os << getCurrentThreadName (); @@ -149,6 +150,8 @@ get_current_thread_name_alt (log4cplus::tostream * s) } // namespace +#endif // DCMTK_LOG4CPLUS_SINGLE_THREADED + DCMTK_LOG4CPLUS_EXPORT log4cplus::tstring const & @@ -198,7 +201,7 @@ namespace log4cplus { namespace thread { namespace impl { #if defined(DCMTK_LOG4CPLUS_USE_PTHREADS) -void* +void* ThreadStart::threadStartFuncWorker(void * arg) #elif defined(DCMTK_LOG4CPLUS_USE_WIN32_THREADS) unsigned @@ -435,7 +438,7 @@ AbstractThread::~AbstractThread() { } -} } // namespace log4cplus { namespace thread { +} } // namespace log4cplus { namespace thread { } // end namespace dcmtk diff --git a/ofstd/include/dcmtk/ofstd/ofbmanip.h b/ofstd/include/dcmtk/ofstd/ofbmanip.h old mode 100644 new mode 100755 index b425a531..b1eb5d03 --- a/ofstd/include/dcmtk/ofstd/ofbmanip.h +++ b/ofstd/include/dcmtk/ofstd/ofbmanip.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2016, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -28,6 +28,7 @@ #include "dcmtk/ofstd/ofdefine.h" #define INCLUDE_CSTRING +#define INCLUDE_CSTDINT #include "dcmtk/ofstd/ofstdinc.h" /*---------------------* @@ -80,9 +81,24 @@ class OFBitmanipTemplate T *dest, const size_t count) { -#ifdef HAVE_MEMMOVE - memmove(OFstatic_cast(void *, dest), OFstatic_cast(const void *, src), OFstatic_cast(size_t, count) * sizeof(T)); +#if defined(HAVE_MEMMOVE) && !defined(PTRDIFF_MAX) + // some platforms have memmove() but not PTRDIFF_MAX. + // In this case, just call memmove(). + memmove(OFstatic_cast(void *, dest), OFstatic_cast(const void *, src), count * sizeof(T)); #else + +#ifdef HAVE_MEMMOVE + // On some platforms (such as MinGW), memmove cannot move buffers + // larger than PTRDIFF_MAX. In the rare case of such huge buffers, + // fall back to our own implementation. + const size_t c = count * sizeof(T); + if (c <= PTRDIFF_MAX) + { + memmove(OFstatic_cast(void *, dest), OFstatic_cast(const void *, src), c); + return; + } +#endif /* HAVE_MEMMOVE */ + if (src == dest) return; @@ -119,7 +135,7 @@ class OFBitmanipTemplate { #ifdef HAVE_MEMSET if ((value == 0) || (sizeof(T) == sizeof(unsigned char))) - memset(OFstatic_cast(void *, dest), OFstatic_cast(int, value), OFstatic_cast(size_t, count) * sizeof(T)); + memset(OFstatic_cast(void *, dest), OFstatic_cast(int, value), count * sizeof(T)); else #endif { @@ -140,7 +156,7 @@ class OFBitmanipTemplate const size_t count) { #ifdef HAVE_MEMZERO - memzero(dest, OFstatic_cast(size_t, count) * sizeof(T)); + memzero(dest, count * sizeof(T)); #else size_t i; T *q = dest; diff --git a/ofstd/include/dcmtk/ofstd/ofcmdln.h b/ofstd/include/dcmtk/ofstd/ofcmdln.h index e3020bf8..53fcc107 100644 --- a/ofstd/include/dcmtk/ofstd/ofcmdln.h +++ b/ofstd/include/dcmtk/ofstd/ofcmdln.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -255,6 +255,17 @@ class DCMTK_OFSTD_EXPORT OFCommandLine */ void setParamColumn(const int column); + /** generates all exclusive options in "general" group (top-level). + * The following options belong to this group: + * - --help (-h): prints the help text and exits + * - --version: prints version information and exit + * + * @param longCols minimum width of the long option column + * @param shortCols minimum width of the short option column + */ + void addGeneralOptions(const int longCols = 0, + const int shortCols = 0); + /** adds an item to the list of valid options * (full version) * diff --git a/ofstd/include/dcmtk/ofstd/offile.h b/ofstd/include/dcmtk/ofstd/offile.h index 8b366f44..7ef3fc9e 100644 --- a/ofstd/include/dcmtk/ofstd/offile.h +++ b/ofstd/include/dcmtk/ofstd/offile.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2006-2018, OFFIS e.V. + * Copyright (C) 2006-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -807,7 +807,7 @@ public: } result = this->fsetpos(&off2); #elif defined(__BEOS__) - result = :: _fseek(fp, offset, whence); + result = :: _fseek(file_, off, whence); #else #ifdef HAVE_FSEEKO #ifdef EXPLICIT_LFS_64 diff --git a/ofstd/include/dcmtk/ofstd/oflist.h b/ofstd/include/dcmtk/ofstd/oflist.h index 45d267c8..e5bba2b6 100644 --- a/ofstd/include/dcmtk/ofstd/oflist.h +++ b/ofstd/include/dcmtk/ofstd/oflist.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2017, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -73,6 +73,10 @@ #else +#ifdef HAVE_ITERATOR_HEADER +#include +#endif + #define INCLUDE_CASSERT #define INCLUDE_CSTDDEF #include "dcmtk/ofstd/ofstdinc.h" @@ -176,6 +180,20 @@ protected: OFIterator(OFListLinkBase * x) : node(x) { } public: + /// member typedef for T + typedef T value_type; + + /// member typedef for T* + typedef T* pointer; + + /// member typedef for T& + typedef T& reference; + +#ifdef HAVE_BIDIRECTIONAL_ITERATOR_CATEGORY + /// member typedef declaring the category + typedef STD_NAMESPACE bidirectional_iterator_tag iterator_category; +#endif + /** default constructor. Creates an iterator referencing nothing. * In general, iterators should always be copy-constructed * in user code. diff --git a/ofstd/include/dcmtk/ofstd/ofstd.h b/ofstd/include/dcmtk/ofstd/ofstd.h index d65bc8c0..f2437b9c 100644 --- a/ofstd/include/dcmtk/ofstd/ofstd.h +++ b/ofstd/include/dcmtk/ofstd/ofstd.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2000-2018, OFFIS e.V. + * Copyright (C) 2000-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -613,10 +613,14 @@ class DCMTK_OFSTD_EXPORT OFStandard * (") is converted to """ instead of """ because the latter entity is not defined. * In HTML mode, the apostrophe sign (') is converted to "'" instead of "'" for the * same reason. + * @note This method might create invalid character entity references, such as "" for ESC, + * if contained in the 'sourceString'. An XML document with such character entities cannot + * be parsed by most XML parsers. However, removing them from the output stream would also + * be no option. ** @param out stream used for the HTML/XHTML/XML mnenonic output * @param sourceString source string to be converted. May contain one or more NULL bytes. * @param convertNonASCII convert non-ASCII characters (< # 32 and >= #127) to numeric value - * (@&@#nnn;) if OFTrue + * (@&@#nnn;) if OFTrue. This might lead to invalid XML character entity references. * @param markupMode convert to HTML, HTML 3.2, XHTML or XML markup. * LF and CR are encoded as " " and " " in XML mode, the flag 'newlineAllowed' * has no meaning in this case. @@ -642,10 +646,14 @@ class DCMTK_OFSTD_EXPORT OFStandard * (") is converted to """ instead of """ because the latter entity is not defined. * In HTML mode, the apostrophe sign (') is converted to "'" instead of "'" for the * same reason. + * @note This method might create invalid character entity references, such as "" for ESC, + * if contained in the 'sourceString'. An XML document with such character entities cannot + * be parsed by most XML parsers. However, removing them from the 'markupString' would also + * be no option. ** @param sourceString source string to be converted. May also contain one or more NULL bytes. * @param markupString reference to character string where the result should be stored * @param convertNonASCII convert non-ASCII characters (< # 32 and >= #127) to numeric value - * (@&@#nnn;) if OFTrue + * (@&@#nnn;) if OFTrue. This might lead to invalid XML character entity references. * @param markupMode convert to HTML, HTML 3.2, XHTML or XML markup string. * LF and CR are encoded as "@&@#10;" and "@&@#13;" in XML mode, the flag 'newlineAllowed' * has no meaning in this case. diff --git a/ofstd/include/dcmtk/ofstd/ofstdinc.h b/ofstd/include/dcmtk/ofstd/ofstdinc.h index 7399f812..dcee816f 100644 --- a/ofstd/include/dcmtk/ofstd/ofstdinc.h +++ b/ofstd/include/dcmtk/ofstd/ofstdinc.h @@ -215,7 +215,7 @@ END_EXTERN_C // define INCLUDE_CMATH to include or if available #ifdef INCLUDE_CMATH -#ifdef HAVE_CMATH +#if defined(USE_STD_CXX_INCLUDES) && defined(HAVE_CMATH) #include #elif defined(HAVE_MATH_H) #ifndef INCLUDE_MATH_H_AS_CXX @@ -264,7 +264,7 @@ END_EXTERN_C // define INCLUDE_CSTDDEF to include or if available #ifdef INCLUDE_CSTDDEF -#ifdef HAVE_CSTDDEF +#if defined(USE_STD_CXX_INCLUDES) && defined(HAVE_CSTDDEF) #include #elif defined(HAVE_STDDEF_H) BEGIN_EXTERN_C @@ -275,7 +275,7 @@ END_EXTERN_C // define INCLUDE_CSTDDINT to include , or if available #ifdef INCLUDE_CSTDINT -#ifdef HAVE_CSTDINT +#if defined(USE_STD_CXX_INCLUDES) && defined(HAVE_CSTDINT) #include #elif defined(HAVE_STDINT_H) #include diff --git a/ofstd/include/dcmtk/ofstd/ofstream.h b/ofstd/include/dcmtk/ofstd/ofstream.h index 9c3775fe..48ed6fdd 100644 --- a/ofstd/include/dcmtk/ofstd/ofstream.h +++ b/ofstd/include/dcmtk/ofstd/ofstream.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2002-2017, OFFIS e.V. + * Copyright (C) 2002-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -135,4 +135,13 @@ typedef STD_NAMESPACE istrstream OFIStringStream; #endif /* USE_STRINGSTREAM */ +// Define OFopenmode_in_nocreate as a macro that either expands +// to ios::in or to ios::in|ios::nocreate, if the historic +// nocreate flag is supported on the platform. +#if defined(HAVE_IOS_NOCREATE) && (__cplusplus < 201103L) +#define OFopenmode_in_nocreate STD_NAMESPACE ios::in|STD_NAMESPACE ios::nocreate +#else +#define OFopenmode_in_nocreate STD_NAMESPACE ios::in +#endif + #endif /* OFSTREAM_H */ diff --git a/ofstd/include/dcmtk/ofstd/ofstrutl.h b/ofstd/include/dcmtk/ofstd/ofstrutl.h new file mode 100644 index 00000000..80c7bed1 --- /dev/null +++ b/ofstd/include/dcmtk/ofstd/ofstrutl.h @@ -0,0 +1,49 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: ofstd + * + * Author: Michael Onken + * + * Purpose: Class with OFString utility methods + * + */ + +#ifndef OFSTRUTL_H +#define OFSTRUTL_H + +#include "dcmtk/config/osconfig.h" /* include OS specific configuration first */ +#include "dcmtk/ofstd/ofstring.h" + +class DCMTK_OFSTD_EXPORT OFStringUtil +{ +public: + /** replace all occurrences of a pattern in the given string (in-place) with + * another string. + * @param src string to perform replacement on and that will contain the result + * @param pattern the pattern to search for in src string + * @param rplc the replacement string that is inserted whenever pattern is found + */ + static void replace_all(OFString& src, const OFString& pattern, const OFString& rplc); + + /** replace all occurrences of a pattern in the given string with + * another string and return a copy of result. + * @param src source string to perform replacement on + * @param pattern the pattern to search for in src string + * @param rplc replacement string that is inserted whenever pattern is found + * @return resulting string with all occurrences of pattern being replaced with rplc string + */ + static OFString replace_all(const OFString& src, const OFString& pattern, const OFString& rplc); +}; + +#endif /* OFSTRUTL_H*/ diff --git a/ofstd/include/dcmtk/ofstd/oftypes.h b/ofstd/include/dcmtk/ofstd/oftypes.h index b8ecd707..63eef5ad 100644 --- a/ofstd/include/dcmtk/ofstd/oftypes.h +++ b/ofstd/include/dcmtk/ofstd/oftypes.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2017, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -71,18 +71,24 @@ inline std::ostream& operator<<( std::ostream& o, OFnullptr_t /* unused */ ) #define INCLUDE_OSTREAM #define INCLUDE_CSTDINT #define INCLUDE_CSTDDEF +#define INCLUDE_CINTTYPES #include "dcmtk/ofstd/ofstdinc.h" typedef signed char Sint8; typedef unsigned char Uint8; +#ifdef PRIu32 /* if that macro exists, we also have int32_t et al */ +typedef int32_t Sint32; +typedef uint32_t Uint32; +#else /* defined(PRIu32) */ #if SIZEOF_LONG == 8 typedef signed int Sint32; typedef unsigned int Uint32; -#else +#else /* SIZEOF_LONG == 8 */ typedef signed long Sint32; typedef unsigned long Uint32; -#endif +#endif /* SIZEOF_LONG == 8 */ +#endif /* defined(PRIu32) */ typedef signed short Sint16; typedef unsigned short Uint16; diff --git a/ofstd/include/dcmtk/ofstd/ofutil.h b/ofstd/include/dcmtk/ofstd/ofutil.h index 871dfabd..856f5732 100644 --- a/ofstd/include/dcmtk/ofstd/ofutil.h +++ b/ofstd/include/dcmtk/ofstd/ofutil.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2014-2018, OFFIS e.V. + * Copyright (C) 2014-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -36,10 +36,17 @@ // -------------------- misc C++11 / non C++11 utils -------------------- -#ifdef HAVE_CXX11 - +// The internet says should always be available, so we include +// it here to fix an issue with compilers that support std::tuple but +// not all of C++11 and perhaps other stuff. #include + +#ifdef HAVE_STL_TUPLE #include +#endif + +#ifdef HAVE_CXX11 + #define OFmove std::move #define OFswap std::swap diff --git a/ofstd/include/dcmtk/ofstd/ofxml.h b/ofstd/include/dcmtk/ofstd/ofxml.h index 65998e7b..f74dac8f 100644 --- a/ofstd/include/dcmtk/ofstd/ofxml.h +++ b/ofstd/include/dcmtk/ofstd/ofxml.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011, OFFIS e.V. + * Copyright (C) 2011-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were slightly modified by @@ -61,7 +61,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @version V2.43 + * @version V2.44 * @author Frank Vanden Berghen * * \section tutorial First Tutorial @@ -144,12 +144,13 @@ #include "dcmtk/ofstd/ofstdinc.h" #include "dcmtk/ofstd/ofdefine.h" -#ifdef _UNICODE +// DCMTK: we might want to enable wide characters without the "official" defines +#if defined(UNICODE) || defined(_UNICODE) || defined(WIDE_CHAR_XML_PARSER) // If you comment the next "define" line then the library will never "switch to" _UNICODE (wchar_t*) mode (16/32 bits per characters). // This is useful when you get error messages like: // 'XMLNode::openFileHelper' : cannot convert parameter 2 from 'const char [5]' to 'const wchar_t *' -// The _XMLWIDECHAR preprocessor variable force the XMLParser library into either utf16/32-mode (the proprocessor variable -// must be defined) or utf8-mode(the pre-processor variable must be undefined). +// The _XMLWIDECHAR preprocessor variable force the XMLParser library into either utf16/32-mode (the preprocessor variable +// must be defined) or utf8-mode (the pre-processor variable must be undefined). #define _XMLWIDECHAR #endif @@ -161,9 +162,11 @@ // DCMTK: Simplified to use our own version in ofstd #define XMLDLLENTRY DCMTK_OFSTD_EXPORT +// DCMTK: we don't want wide characters on other systems than Windows +#if !defined(_XMLWINDOWS) || !defined(_XMLWIDECHAR) // uncomment the next line if you want no support for wchar_t* (no need for the or libraries anymore to compile) -// DCMTK: we don't want wide characters #define XML_NO_WIDE_CHAR +#endif #ifdef XML_NO_WIDE_CHAR // DCMTK: we definitely need the following define on Windows systems @@ -321,7 +324,7 @@ typedef struct XMLDLLENTRY XMLNode /// Parse an XML file and return the root of a XMLNode tree representing the file. A very crude error checking is made. An attempt to guess the Char Encoding used in the file is made. static XMLNode openFileHelper(XMLCSTR filename, XMLCSTR tag=NULL); /**< The "openFileHelper" function reports to the screen all the warnings and errors that occurred during parsing of the XML file. - * This function also tries to guess char Encoding (UTF-8, ASCII or SHIT-JIS) based on the first 200 bytes of the file. Since each + * This function also tries to guess char Encoding (UTF-8, ASCII or SHIFT-JIS) based on the first 200 bytes of the file. Since each * application has its own way to report and deal with errors, you should rather use the "parseFile" function to parse XML files * and program yourself thereafter an "error reporting" tailored for your needs (instead of using the very crude "error reporting" * mechanism included inside the "openFileHelper" function). @@ -683,25 +686,26 @@ XMLDLLENTRY XMLSTR stringDup(XMLCSTR source, int cbData=-1); XMLDLLENTRY void freeXMLString(XMLSTR t); // {free(t);} /** @} */ -// DCMTK: currently, these functions are not needed -#if 0 /** @defgroup atoX ato? like functions * @ingroup XMLParserGeneral - * The "xmlto?" functions are equivalents to the atoi, atol, atof functions. + * The "xmlto?" functions are equivalents to the atoi, atol, atoll, atof functions. * The only difference is: If the variable "xmlString" is NULL, than the return value - * is "defautValue". These 6 functions are only here as "convenience" functions for the + * is "defautValue". These 7 functions are only here as "convenience" functions for the * user (they are not used inside the XMLparser). If you don't need them, you can * delete them without any trouble. * * @{ */ -XMLDLLENTRY char xmltob(XMLCSTR xmlString,char defautValue=0); -XMLDLLENTRY int xmltoi(XMLCSTR xmlString,int defautValue=0); -XMLDLLENTRY long xmltol(XMLCSTR xmlString,long defautValue=0); -XMLDLLENTRY double xmltof(XMLCSTR xmlString,double defautValue=.0); -XMLDLLENTRY XMLCSTR xmltoa(XMLCSTR xmlString,XMLCSTR defautValue=_CXML("")); -XMLDLLENTRY XMLCHAR xmltoc(XMLCSTR xmlString,const XMLCHAR defautValue=_CXML('\0')); -/** @} */ +XMLDLLENTRY char xmltob (XMLCSTR xmlString,char defautValue=0); +XMLDLLENTRY int xmltoi (XMLCSTR xmlString,int defautValue=0); +XMLDLLENTRY long xmltol (XMLCSTR xmlString,long defautValue=0); +// DCMTK adds xmltoll() in addition to xmltol() +#if defined(HAVE_LONG_LONG) && (defined(HAVE_ATOLL) || defined (_XMLWINDOWS)) +XMLDLLENTRY long long xmltoll(XMLCSTR xmlString,long long defautValue=0); #endif +XMLDLLENTRY double xmltof (XMLCSTR xmlString,double defautValue=.0); +XMLDLLENTRY XMLCSTR xmltoa (XMLCSTR xmlString,XMLCSTR defautValue=_CXML("")); +XMLDLLENTRY XMLCHAR xmltoc (XMLCSTR xmlString,const XMLCHAR defautValue=_CXML('\0')); +/** @} */ /** @defgroup ToXMLStringTool Helper class to create XML files using "printf", "fprintf", "cout",... functions. * @ingroup XMLParserGeneral diff --git a/ofstd/libsrc/CMakeLists.txt b/ofstd/libsrc/CMakeLists.txt index 384f5f3d..dee1308a 100644 --- a/ofstd/libsrc/CMakeLists.txt +++ b/ofstd/libsrc/CMakeLists.txt @@ -1,4 +1,4 @@ # create library from source files -DCMTK_ADD_LIBRARY(ofstd ofchrenc ofcmdln ofconapp ofcond ofconfig ofconsol ofcrc32 ofdate ofdatime oferror offile offilsys offname oflist ofstd ofstring ofthread oftime oftimer oftempf ofxml ofuuid ofmath ofsockad ofrand) +DCMTK_ADD_LIBRARY(ofstd ofchrenc ofcmdln ofconapp ofcond ofconfig ofconsol ofcrc32 ofdate ofdatime oferror offile offilsys offname oflist ofstd ofstring ofstrutl ofthread oftime oftimer oftempf ofxml ofuuid ofmath ofsockad ofrand) DCMTK_TARGET_LINK_LIBRARIES(ofstd ${CHARSET_CONVERSION_LIBS} ${SOCKET_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES}) diff --git a/ofstd/libsrc/Makefile.dep b/ofstd/libsrc/Makefile.dep index 660d3510..c90c7870 100644 --- a/ofstd/libsrc/Makefile.dep +++ b/ofstd/libsrc/Makefile.dep @@ -171,6 +171,12 @@ ofstring.o: ofstring.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../include/dcmtk/ofstd/oferror.h +ofstrutl.o: ofstrutl.cc ../include/dcmtk/ofstd/ofstrutl.h \ + ../../config/include/dcmtk/config/osconfig.h \ + ../include/dcmtk/ofstd/ofstring.h ../include/dcmtk/ofstd/oftypes.h \ + ../include/dcmtk/ofstd/ofdefine.h ../include/dcmtk/ofstd/ofcast.h \ + ../include/dcmtk/ofstd/ofexport.h ../include/dcmtk/ofstd/ofstdinc.h \ + ../include/dcmtk/ofstd/ofstream.h oftempf.o: oftempf.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/ofstd/oftempf.h ../include/dcmtk/ofstd/ofcond.h \ ../include/dcmtk/ofstd/oftypes.h ../include/dcmtk/ofstd/ofdefine.h \ diff --git a/ofstd/libsrc/Makefile.in b/ofstd/libsrc/Makefile.in index 97c2c3c9..76c9e64b 100644 --- a/ofstd/libsrc/Makefile.in +++ b/ofstd/libsrc/Makefile.in @@ -18,7 +18,7 @@ LOCALDEFS = objs = oflist.o ofstring.o ofcmdln.o ofconapp.o offname.o ofconsol.o ofthread.o \ ofcond.o ofstd.o ofcrc32.o ofdate.o oftime.o ofdatime.o oftimer.o \ ofconfig.o ofchrenc.o oftempf.o ofxml.o ofuuid.o offile.o offilsys.o \ - ofmath.o oferror.o ofsockad.o ofrand.o + ofmath.o oferror.o ofsockad.o ofrand.o ofstrutl.o library = libofstd.$(LIBEXT) diff --git a/ofstd/libsrc/ofchrenc.cc b/ofstd/libsrc/ofchrenc.cc index d93ef753..a90cc79d 100644 --- a/ofstd/libsrc/ofchrenc.cc +++ b/ofstd/libsrc/ofchrenc.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011-2016, OFFIS e.V. + * Copyright (C) 2011-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -27,11 +27,8 @@ #include "dcmtk/ofstd/ofdiag.h" #include "dcmtk/ofstd/ofconsol.h" -BEGIN_EXTERN_C -#ifdef HAVE_SYS_ERRNO_H -#include -#endif -END_EXTERN_C +#define INCLUDE_CERRNO +#include "dcmtk/ofstd/ofstdinc.h" #ifdef HAVE_WINDOWS_H #define WIN32_LEAN_AND_MEAN @@ -55,6 +52,18 @@ const unsigned int OFCharacterEncoding::CPC_UTF8 = CP_UTF8; #ifdef DCMTK_ENABLE_CHARSET_CONVERSION #if DCMTK_ENABLE_CHARSET_CONVERSION == DCMTK_CHARSET_CONVERSION_ICU + +// Workaround for ICU. Type char16_t is only supported since C++11. +#ifndef HAVE_CHAR16_T +#define UCHAR_TYPE uint16_t +#endif + +// Another Workaround for ICU. DCMTK does not use exceptions. +// If U_NOEXCEPT is not defined, ICU falls back to NOEXCEPT. +#ifndef HAVE_CXX11 +#define U_NOEXCEPT +#endif + #include #include diff --git a/ofstd/libsrc/ofcmdln.cc b/ofstd/libsrc/ofcmdln.cc index 0838b78e..8d6efc07 100644 --- a/ofstd/libsrc/ofcmdln.cc +++ b/ofstd/libsrc/ofcmdln.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1998-2018, OFFIS e.V. + * Copyright (C) 1998-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -15,7 +15,7 @@ * * Author: Joerg Riesmeier * - * Purpose: Template class for command line arguments (Source) + * Purpose: Handle command line arguments (Source) * */ @@ -32,7 +32,6 @@ #include #endif - /*---------------------* * macro definitions * *---------------------*/ @@ -269,6 +268,13 @@ OFBool OFCommandLine::checkOption(const OFString &option, return result; } +void OFCommandLine::addGeneralOptions(const int longCols, + const int shortCols) +{ + addGroup("general options:", longCols, shortCols + 2); + addOption("--help", "-h", "print this help text and exit", OFCommandLine::AF_Exclusive); + addOption("--version", "print version information and exit", OFCommandLine::AF_Exclusive); +} OFBool OFCommandLine::addOption(const char *longOpt, const char *shortOpt, @@ -1089,11 +1095,7 @@ OFCommandLine::E_ParseStatus OFCommandLine::parseCommandFile(const char *argValu /* skip '@' symbol in filename */ const char *filename = argValue + 1; /* open command file */ -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE ifstream cmdFile(filename, STD_NAMESPACE ios::in|STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE ifstream cmdFile(filename, STD_NAMESPACE ios::in); -#endif + STD_NAMESPACE ifstream cmdFile(filename, OFopenmode_in_nocreate); if (cmdFile) { char c, block = 0; @@ -1169,11 +1171,7 @@ OFCommandLine::E_ParseStatus OFCommandLine::parseCommandFile(const wchar_t *argV /* skip '@' symbol in filename */ const wchar_t *filename = argValue + 1; /* open command file */ -#ifdef HAVE_IOS_NOCREATE - STD_NAMESPACE wifstream cmdFile(filename, STD_NAMESPACE ios::in|STD_NAMESPACE ios::nocreate); -#else - STD_NAMESPACE wifstream cmdFile(filename, STD_NAMESPACE ios::in); -#endif + STD_NAMESPACE wifstream cmdFile(filename, OFopenmode_in_nocreate); if (cmdFile) { wchar_t c, block = 0; diff --git a/ofstd/libsrc/ofstd.cc b/ofstd/libsrc/ofstd.cc index 1ece8c77..3986939a 100644 --- a/ofstd/libsrc/ofstd.cc +++ b/ofstd/libsrc/ofstd.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2001-2018, OFFIS e.V. + * Copyright (C) 2001-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -3120,4 +3120,16 @@ OFerror_code OFStandard::getLastNetworkErrorCode() #endif } -DCMTK_OFSTD_EXPORT OFin_place_tag OFin_place() { return *static_cast(OFnullptr); } +// black magic: +// The C++ standard says that std::in_place should not be called as a function, +// but the linker says we still need a function body. Normally, we would mark +// it as [[noreturn]] and be done, but that's not available pre C++11. +// Therefore, we need a return statement to silence 'missing return statement...' +// style warnings. However, OFin_place_tag is a forward declared struct with +// no actual definition, so, we cannot return an actual OFin_place_tag object. +// Instead, we cast some pointer to it although that is actually bullshit, but +// the code will never be executed anyway. Prior versions of this code returned +// a casted nullptr, but some compilers are just too smart and return a warning +// for that, so, now we cast a pointer to OFnullptr into an OFin_place_tag +// instead to silence the warnings. +DCMTK_OFSTD_EXPORT OFin_place_tag OFin_place() { return *reinterpret_cast(&OFnullptr); } diff --git a/ofstd/libsrc/ofstring.cc b/ofstd/libsrc/ofstring.cc index 87dcba38..d537315d 100644 --- a/ofstd/libsrc/ofstring.cc +++ b/ofstd/libsrc/ofstring.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2018, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by diff --git a/ofstd/libsrc/ofstrutl.cc b/ofstd/libsrc/ofstrutl.cc new file mode 100644 index 00000000..d2231c67 --- /dev/null +++ b/ofstd/libsrc/ofstrutl.cc @@ -0,0 +1,45 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: ofstd + * + * Author: Michael Onken + * + * Purpose: Class with OFString utility methods + * + */ + +#include "dcmtk/ofstd/ofstrutl.h" +#include "dcmtk/config/osconfig.h" /* include OS specific configuration first */ + +void OFStringUtil::replace_all(OFString& src, const OFString& pattern, const OFString& rplc) +{ + if (!pattern.empty()) + { + size_t pos = src.find(pattern, 0); + while (pos != OFString_npos) + { + src.replace(pos, pattern.length(), rplc); + pos += rplc.length(); + pos = src.find(pattern, pos); + } + } +} + +OFString +OFStringUtil::replace_all(const OFString& src, const OFString& pattern, const OFString& rplc) +{ + OFString result(src); + OFStringUtil::replace_all(result, pattern, rplc); + return result; +} diff --git a/ofstd/libsrc/ofxml.cc b/ofstd/libsrc/ofxml.cc index 8cc9108a..9ff4d4a7 100644 --- a/ofstd/libsrc/ofxml.cc +++ b/ofstd/libsrc/ofxml.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011-2016, OFFIS e.V. + * Copyright (C) 2011-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were slightly modified by @@ -25,7 +25,7 @@ * for portability. It works by using recursion and a node tree for breaking * down the elements of an XML document.

* - * @version V2.43 + * @version V2.44 * @author Frank Vanden Berghen * * NOTE: @@ -125,7 +125,7 @@ #define INCLUDE_CSTDLIB #include "dcmtk/ofstd/ofstdinc.h" -// workaround for SunPro not defining these C functions in the global namespace +// DCMTK: workaround for SunPro not defining these C functions in the global namespace #ifdef __sun using STD_NAMESPACE free; using STD_NAMESPACE malloc; @@ -143,7 +143,7 @@ using STD_NAMESPACE ftell; using STD_NAMESPACE fclose; #endif -XMLCSTR XMLNode::getVersion() { return _CXML("v2.43"); } +XMLCSTR XMLNode::getVersion() { return _CXML("v2.44"); } void freeXMLString(XMLSTR t){if(t)free(t);} static XMLNode::XMLCharEncoding characterEncoding=XMLNode::char_encoding_UTF8; @@ -424,30 +424,42 @@ char myIsTextWideChar(const void * /*b*/, int /*len*/) { return FALSE; } /////////////////////////////////////////////////////////////////////////////// -// the "xmltoc,xmltob,xmltoi,xmltol,xmltof,xmltoa" functions // +// the "xmltoc,xmltob,xmltoi,xmltol,xmltoll,xmltof,xmltoa" functions // /////////////////////////////////////////////////////////////////////////////// -// These 6 functions are not used inside the XMLparser. +// These 7 functions are not used inside the XMLparser. // There are only here as "convenience" functions for the user. // If you don't need them, you can delete them without any trouble. #ifdef _XMLWIDECHAR #ifdef _XMLWINDOWS // for Microsoft Visual Studio 6.0 and Microsoft Visual Studio .NET and Borland C++ Builder 6.0 - char xmltob(XMLCSTR t,char v){ if (t&&(*t)) return (char)_wtoi(t); return v; } - int xmltoi(XMLCSTR t,int v){ if (t&&(*t)) return _wtoi(t); return v; } - long xmltol(XMLCSTR t,long v){ if (t&&(*t)) return _wtol(t); return v; } - double xmltof(XMLCSTR t,double v){ if (t&&(*t)) swscanf(t, L"%lf", &v); /*v=_wtof(t);*/ return v; } + char xmltob (XMLCSTR t,char v){ if (t&&(*t)) return (char)_wtoi(t); return v; } + int xmltoi (XMLCSTR t,int v){ if (t&&(*t)) return _wtoi(t); return v; } + long xmltol (XMLCSTR t,long v){ if (t&&(*t)) return _wtol(t); return v; } + #ifdef HAVE_LONG_LONG + // DCMTK adds xmltoll() in addition to xmltol() + long long xmltoll(XMLCSTR t,long long v){ if (t&&(*t)) return _wtoi64(t); return v; } + #endif + double xmltof (XMLCSTR t,double v){ if (t&&(*t)) swscanf(t, L"%lf", &v); /*v=_wtof(t);*/ return v; } #else #ifdef sun // for CC - #include - char xmltob(XMLCSTR t,char v){ if (t) return (char)wstol(t,NULL,10); return v; } - int xmltoi(XMLCSTR t,int v){ if (t) return (int)wstol(t,NULL,10); return v; } - long xmltol(XMLCSTR t,long v){ if (t) return wstol(t,NULL,10); return v; } + #include + char xmltob (XMLCSTR t,char v){ if (t) return (char)wstol(t,NULL,10); return v; } + int xmltoi (XMLCSTR t,int v){ if (t) return (int)wstol(t,NULL,10); return v; } + long xmltol (XMLCSTR t,long v){ if (t) return wstol(t,NULL,10); return v; } + #ifdef HAVE_LONG_LONG + // DCMTK adds xmltoll() in addition to xmltol() + long long xmltoll(XMLCSTR t,long long v){ if (t) return wstol(t,NULL,10); return v; } + #endif #else // for gcc - char xmltob(XMLCSTR t,char v){ if (t) return (char)wcstol(t,NULL,10); return v; } - int xmltoi(XMLCSTR t,int v){ if (t) return (int)wcstol(t,NULL,10); return v; } - long xmltol(XMLCSTR t,long v){ if (t) return wcstol(t,NULL,10); return v; } + char xmltob (XMLCSTR t,char v){ if (t) return (char)wcstol(t,NULL,10); return v; } + int xmltoi (XMLCSTR t,int v){ if (t) return (int)wcstol(t,NULL,10); return v; } + long xmltol (XMLCSTR t,long v){ if (t) return wcstol(t,NULL,10); return v; } + #ifdef HAVE_LONG_LONG + // DCMTK adds xmltoll() in addition to xmltol() + long long xmltoll(XMLCSTR t,long long v){ if (t) return wcstol(t,NULL,10); return v; } + #endif #endif double xmltof(XMLCSTR t,double v){ if (t&&(*t)) swscanf(t, L"%lf", &v); /*v=_wtof(t);*/ return v; } #endif @@ -455,6 +467,14 @@ char myIsTextWideChar(const void * /*b*/, int /*len*/) { return FALSE; } char xmltob(XMLCSTR t,char v){ if (t&&(*t)) return OFstatic_cast(char, atoi(t)); return v; } int xmltoi(XMLCSTR t,int v){ if (t&&(*t)) return atoi(t); return v; } long xmltol(XMLCSTR t,long v){ if (t&&(*t)) return atol(t); return v; } + #ifdef HAVE_LONG_LONG + // DCMTK adds xmltoll() in addition to xmltol() + #ifdef _XMLWINDOWS + long long xmltoll(XMLCSTR t,long long v){ if (t&&(*t)) return _atoi64(t); return v; } + #elif defined(HAVE_ATOLL) + long long xmltoll(XMLCSTR t,long long v){ if (t&&(*t)) return atoll(t); return v; } + #endif + #endif double xmltof(XMLCSTR t,double v){ if (t&&(*t)) return atof(t); return v; } #endif XMLCSTR xmltoa(XMLCSTR t, XMLCSTR v){ if (t) return t; return v; } @@ -491,7 +511,11 @@ XMLNode XMLNode::openFileHelper(XMLCSTR filename, XMLCSTR tag) // create message char message[2000],*s1=(char*)"",*s3=(char*)""; XMLCSTR s2=_CXML(""); if (pResults.error==eXMLErrorFirstTagNotFound) { s1=(char*)"First Tag should be '"; s2=tag; s3=(char*)"'.\n"; } - sprintf(message, +#ifdef _XMLWINDOWS + _snprintf(message,2000, +#else + snprintf(message,2000, +#endif #ifdef _XMLWIDECHAR "XML Parsing error inside file '%S'.\n%S\nAt line %i, column %i.\n%s%S%s" #else @@ -777,9 +801,36 @@ XMLSTR ToXMLStringTool::toXMLUnSafe(XMLSTR dest,XMLCSTR source) #else switch(XML_ByteTable[OFstatic_cast(unsigned char, ch)]) { - case 4: *(dest++)=*(source++); - case 3: *(dest++)=*(source++); - case 2: *(dest++)=*(source++); + case 4: + if ((!(source[1]))||(!(source[2]))||(!(source[3]))) { *(dest++)='_'; source++; } + else + { + *dest=*source; + dest[1]=source[1]; + dest[2]=source[2]; + dest[3]=source[3]; + dest+=4; source+=4; + } + break; + case 3: + if ((!(source[1]))||(!(source[2]))) { *(dest++)='_'; source++; } + else + { + *dest=*source; + dest[1]=source[1]; + dest[2]=source[2]; + dest+=3; source+=3; + } + break; + case 2: + if (!(source[1])) { *(dest++)='_'; source++; } + else + { + *dest=*source; + dest[1]=source[1]; + dest+=2; source+=2; + } + break; case 1: *(dest++)=*(source++); } #endif diff --git a/ofstd/tests/CMakeLists.txt b/ofstd/tests/CMakeLists.txt index 09de5a31..33451826 100644 --- a/ofstd/tests/CMakeLists.txt +++ b/ofstd/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # declare executables -DCMTK_ADD_EXECUTABLE(ofstd_tests tests tatof terror tmap tvec tfilsys tftoa tthread tbase64 tstring tlist tstack tofdatim tofstd tmarkup tchrenc txml tuuid toffile tmem toption ttuple tlimits tvariant) +DCMTK_ADD_EXECUTABLE(ofstd_tests tests tatof terror tmap tvec tfilsys tftoa tthread tbase64 tstring tstrutl tlist tstack tofdatim tofstd tmarkup tchrenc txml tuuid toffile tmem toption ttuple tlimits tvariant) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(ofstd_tests ofstd) diff --git a/ofstd/tests/Makefile.dep b/ofstd/tests/Makefile.dep index 50b08f88..f522e116 100644 --- a/ofstd/tests/Makefile.dep +++ b/ofstd/tests/Makefile.dep @@ -253,6 +253,19 @@ tstring.o: tstring.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/ofstd/oflimits.h \ ../../config/include/dcmtk/config/arith.h \ ../include/dcmtk/ofstd/oferror.h ../include/dcmtk/ofstd/ofexit.h +tstrutl.o: tstrutl.cc ../../config/include/dcmtk/config/osconfig.h \ + ../include/dcmtk/ofstd/ofstring.h ../include/dcmtk/ofstd/oftypes.h \ + ../include/dcmtk/ofstd/ofdefine.h ../include/dcmtk/ofstd/ofcast.h \ + ../include/dcmtk/ofstd/ofexport.h ../include/dcmtk/ofstd/ofstdinc.h \ + ../include/dcmtk/ofstd/ofstream.h ../include/dcmtk/ofstd/ofstrutl.h \ + ../include/dcmtk/ofstd/oftest.h ../include/dcmtk/ofstd/ofconapp.h \ + ../include/dcmtk/ofstd/ofcmdln.h ../include/dcmtk/ofstd/ofexbl.h \ + ../include/dcmtk/ofstd/oftraits.h ../include/dcmtk/ofstd/oflist.h \ + ../include/dcmtk/ofstd/ofconsol.h ../include/dcmtk/ofstd/ofthread.h \ + ../include/dcmtk/ofstd/offile.h ../include/dcmtk/ofstd/ofstd.h \ + ../include/dcmtk/ofstd/ofcond.h ../include/dcmtk/ofstd/oflimits.h \ + ../../config/include/dcmtk/config/arith.h \ + ../include/dcmtk/ofstd/oferror.h ../include/dcmtk/ofstd/ofexit.h tthread.o: tthread.cc ../../config/include/dcmtk/config/osconfig.h \ ../include/dcmtk/ofstd/oftest.h ../include/dcmtk/ofstd/ofconapp.h \ ../include/dcmtk/ofstd/oftypes.h ../include/dcmtk/ofstd/ofdefine.h \ diff --git a/ofstd/tests/Makefile.in b/ofstd/tests/Makefile.in index f8a72972..7551808d 100644 --- a/ofstd/tests/Makefile.in +++ b/ofstd/tests/Makefile.in @@ -18,7 +18,7 @@ LOCALLIBS = -lofstd $(CHARCONVLIBS) $(MATHLIBS) LOCALTRASH = *.out testfile.\$$\$$\$$ test_objs = tests.o tatof.o tmap.o tvec.o tfilsys.o tftoa.o tthread.o \ - tbase64.o tstring.o tlist.o tstack.o tofdatim.o tofstd.o \ + tbase64.o tstring.o tstrutl.o tlist.o tstack.o tofdatim.o tofstd.o \ tmarkup.o tchrenc.o txml.o tuuid.o toffile.o tmem.o toption.o \ ttuple.o tlimits.o tvariant.o terror.o objs = $(test_objs) diff --git a/ofstd/tests/tests.cc b/ofstd/tests/tests.cc index a2e8f9d8..a419911b 100644 --- a/ofstd/tests/tests.cc +++ b/ofstd/tests/tests.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2011-2018, OFFIS e.V. + * Copyright (C) 2011-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -82,5 +82,6 @@ OFTEST_REGISTER(ofstd_variant); OFTEST_REGISTER(ofstd_error); OFTEST_REGISTER(ofstd_filesystem); OFTEST_REGISTER(ofstd_snprintf); +OFTEST_REGISTER(ofstd_OFStringUtil_replace_all); OFTEST_MAIN("ofstd") diff --git a/ofstd/tests/tstring.cc b/ofstd/tests/tstring.cc index a6fe5d50..ebed9df8 100644 --- a/ofstd/tests/tstring.cc +++ b/ofstd/tests/tstring.cc @@ -1,6 +1,6 @@ /* * - * Copyright (C) 1997-2011, OFFIS e.V. + * Copyright (C) 1997-2019, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -217,6 +217,7 @@ OFTEST(ofstd_OFString_substr) OFCHECK_EQUAL(x, "jello"); } + OFTEST(ofstd_OFString_reserve) { OFString z; diff --git a/ofstd/tests/tstrutl.cc b/ofstd/tests/tstrutl.cc new file mode 100644 index 00000000..e6101085 --- /dev/null +++ b/ofstd/tests/tstrutl.cc @@ -0,0 +1,96 @@ +/* + * + * Copyright (C) 2019, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by + * + * OFFIS e.V. + * R&D Division Health + * Escherweg 2 + * D-26121 Oldenburg, Germany + * + * + * Module: ofstd + * + * Author: Michael Onken + * + * Purpose: Tests for string utilities + * + */ + +#include "dcmtk/config/osconfig.h" /* include OS specific configuration first */ + +#include "dcmtk/ofstd/ofstring.h" +#include "dcmtk/ofstd/ofstrutl.h" + +#define OFTEST_OFSTD_ONLY +#include "dcmtk/ofstd/oftest.h" + + +OFTEST(ofstd_OFStringUtil_replace_all) +{ + // Pattern found + + OFString s("Jon"); + OFStringUtil::replace_all(s, "Jon", "Doe"); + OFCHECK_EQUAL(s, "Doe"); + + s = "Jon Doe"; + OFStringUtil::replace_all(s, "Jon", "Doe"); + OFCHECK_EQUAL(s, "Doe Doe"); + + s = "blablabla"; + OFStringUtil::replace_all(s, "b", "p"); + OFCHECK_EQUAL(s, "plaplapla"); + + s = "plaplapla"; + OFStringUtil::replace_all(s, "pla", ""); + OFCHECK_EQUAL(s, ""); + + s = "blablabla"; + OFStringUtil::replace_all(s, "bl", "b"); + OFCHECK_EQUAL(s, "bababa"); + + s = "blablabla"; + OFStringUtil::replace_all(s, "bla", "bla"); + OFCHECK_EQUAL(s, "blablabla"); + + s = "blablabla"; + OFStringUtil::replace_all(s, "b", "bo"); + OFCHECK_EQUAL(s, "bolabolabola"); + + // Pattern found and part of replacement + + s = "blabla"; + OFStringUtil::replace_all(s, "bla", "blabla"); + OFCHECK_EQUAL(s, "blablablabla"); + + // Pattern not found + + s = "Jon"; + OFStringUtil::replace_all(s, "Doe", "Doe"); + OFCHECK_EQUAL(s, "Jon"); + + s = ""; + OFStringUtil::replace_all(s, "Doe", "Doe"); + OFCHECK_EQUAL(s, ""); + + s = "blablabla"; + OFStringUtil::replace_all(s, "Doe", ""); + OFCHECK_EQUAL(s, "blablabla"); + + // Empty pattern or source (should have no effect) + s = "blablabla"; + OFStringUtil::replace_all(s, "", "notfound"); + OFCHECK_EQUAL(s, "blablabla"); + + s = ""; + OFStringUtil::replace_all(s, "", "notfound"); + OFCHECK_EQUAL(s, ""); + + s = "This is the home of the brother of my brother"; + OFStringUtil::replace_all(s, "brother", "sister"); + OFCHECK_EQUAL(s, "This is the home of the sister of my sister"); + +} diff --git a/ofstd/tests/tvec.cc b/ofstd/tests/tvec.cc index 004a83e9..9a991dbe 100644 --- a/ofstd/tests/tvec.cc +++ b/ofstd/tests/tvec.cc @@ -43,9 +43,18 @@ OFTEST(ofstd_OFVector) // Test whether iterators stay valid if enough space was reserved m.reserve(6); it = m.begin(); + OFCHECK(it == m.begin()); + OFCHECK(it == m.end()); + + // the first push_back() invalidates the iterator, + // therefore, get a new one + m.push_back(1); + it = m.begin(); + OFCHECK(it == m.begin()); + OFCHECK(it != m.end()); // Fill with some entries - for (i = 1; i <= 6; ++i) + for (i = 2; i <= 6; ++i) m.push_back(i); OFCHECK(it == m.begin());